Browse Source

[changed] din_van 'dynamic $showerdin' to use shampoo by default. Those custom shower acts in non-events will now require shampoo. Events can now use 'noShampoo = 1' to bypass shampoo usage.
[changed] some bathrooms to block shower usage when shampoo count is zero (school changerooms, gyms, photo studio, porn studio, private bathrooms).
[changed] rebalanced saunawhore to require actual products, which you now pay for with your earnings if required.
[added] some new messages when using your own shampoo or using someone else's (noShampoo) via 'dynamic $shower'
Ran trailing space trim on all files.

3xpurt 5 years ago
parent
commit
7882d0fcf4
46 changed files with 1209 additions and 956 deletions
  1. 10 9
      locations/BDsex.qsrc
  2. 35 34
      locations/BelSex.qsrc
  3. 1 1
      locations/FedorEv2.qsrc
  4. 10 4
      locations/FedorEv4.qsrc
  5. 22 16
      locations/Gadbana.qsrc
  6. 12 12
      locations/IrinaRoom.qsrc
  7. 3 0
      locations/KatjaHomeTalk.qsrc
  8. 13 12
      locations/LBZhouse.qsrc
  9. 10 2
      locations/VoltrenerSexShower.qsrc
  10. 19 8
      locations/abduction.qsrc
  11. 1 0
      locations/albinahome.qsrc
  12. 1 0
      locations/anushapt.qsrc
  13. 14 13
      locations/backwater.qsrc
  14. 17 13
      locations/brothel.qsrc
  15. 12 11
      locations/brother_voyeur.qsrc
  16. 39 36
      locations/buklinik_event.qsrc
  17. 75 68
      locations/dimaHome.qsrc
  18. 41 28
      locations/din_van.qsrc
  19. 11 5
      locations/etoexhib.qsrc
  20. 30 26
      locations/fit.qsrc
  21. 144 133
      locations/foto.qsrc
  22. 19 14
      locations/gdksport.qsrc
  23. 11 7
      locations/gschool_boys_bathroom.qsrc
  24. 5 1
      locations/gschool_grounds.qsrc
  25. 7 1
      locations/gschool_lessons2.qsrc
  26. 30 28
      locations/hotel_resep.qsrc
  27. 41 40
      locations/husbSex.qsrc
  28. 3 0
      locations/katjaEv.qsrc
  29. 3 3
      locations/kotovdom.qsrc
  30. 164 164
      locations/lesbisubhouse.qsrc
  31. 10 6
      locations/mey_vika_events.qsrc
  32. 80 79
      locations/natbelapt.qsrc
  33. 56 55
      locations/nichTaras.qsrc
  34. 1 0
      locations/placer_sex.qsrc
  35. 19 2
      locations/porn_view.qsrc
  36. 98 17
      locations/pornfilm.qsrc
  37. 1 0
      locations/postevents.qsrc
  38. 72 67
      locations/rolanbath.qsrc
  39. 48 12
      locations/sauna.qsrc
  40. 7 25
      locations/saunawhore.qsrc
  41. 1 0
      locations/shulgabath.qsrc
  42. 1 0
      locations/swamphouse.qsrc
  43. 1 0
      locations/vanrPar.qsrc
  44. 9 4
      locations/yarik.qsrc
  45. 1 0
      locations/yban.qsrc
  46. 1 0
      locations/youry.qsrc

+ 10 - 9
locations/BDsex.qsrc

@@ -277,7 +277,7 @@ if $ARGS[0] = 'hj':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					gs 'cum_manage'
 					protect = 0
 					if sexcontra = 4:
@@ -380,7 +380,7 @@ if $ARGS[0] = 'minet':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					'<<$boydesc>> finishes, filling the condom with his cum.'
 					protect = 0
 					sexcontra = 0
@@ -390,9 +390,9 @@ if $ARGS[0] = 'minet':
 					'<<$boydesc>> finished all over your hands covering them in hot and sticky cum.'
 					spafinloc = 13
 					sexpartkno = 1
-					gs 'cum_manage'	
+					gs 'cum_manage'
 					gs 'arousal', 'end'
-					gs 'stat'				
+					gs 'stat'
 				end
 				act 'Leave':gt 'BDsex', 'end'
 			end
@@ -446,7 +446,7 @@ if $ARGS[0] = 'minet':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand2.jpg"></center>'
-				if protect = 1: 
+				if protect = 1:
 					'<<$boydesc>> finishes, filling the condom with his cum.'
 					protect = 0
 					sexcontra = 0
@@ -471,7 +471,7 @@ if $ARGS[0] = 'facial':
 	minut += 3
 	picrand = rand(11, 15)
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
-	if protect = 1: 
+	if protect = 1:
 		'<<$boydesc>> finishes, filling the condom with his cum.'
 		protect = 0
 		sexcontra = 0
@@ -481,7 +481,7 @@ if $ARGS[0] = 'facial':
 		sexpartkno = 1
 		gs 'cum_manage'
 	end
-	gs 'stat'			
+	gs 'stat'
 	act 'Brush up':gt 'BDsex', 'end'
 end
 
@@ -489,7 +489,7 @@ if $ARGS[0] = 'swallow':
 	minut += 3
 	picrand = rand(20, 29)
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<picrand>>.jpg"></center>'
-	if protect = 1: 
+	if protect = 1:
 		'<<$boydesc>> finishes, and you feel the condom balloon up in your mouth.'
 		protect = 0
 		sexcontra = 0
@@ -500,7 +500,7 @@ if $ARGS[0] = 'swallow':
 		gs 'cum_manage'
 		swallow += 1
 	end
-	gs 'stat'			
+	gs 'stat'
 	act 'Brush up':gt 'BDsex', 'end'
 end
 
@@ -542,6 +542,7 @@ if $ARGS[0] = 'end':
 		pcs_horny += 1
 		pcs_hairbsh = 1
 		pcs_makeup = 1
+		noShampoo = 1
 		dynamic $showerdin
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		'You go into the bathroom and turn on the shower, lathering body and washing as well as you can.'

+ 35 - 34
locations/BelSex.qsrc

@@ -13,12 +13,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'sex':
 
 	belact = rand(1,3)
 	'You suck <<$boydesc>>''s tongue as he kisses you, doing your best to please him in any way you can... because who knows what he''ll do if you don''t. He crudely kneads your butt and upper thighs, grabbing your ass cheeks and slapping them, making your ass cheeks jiggle.'
-	
+
 	gs 'arousal', 'kiss', 5, 'sub', 'prostitution'
 	gs 'arousal', 'foreplay', 5, 'sub', 'prostitution'
 	minut -= 5
 	gs 'stat'
-	
+
 	belybj = rand(0,2)
 	if belybj = 0:
 		'<<$boydesc>> puts his large hands on your shoulders and forces you downwards. Even though you''re trying to cooperate and drop to your knees as soon as you realize what he wants, he''s still kind of rough with you. "Start sucking, <<$pcs_nickname>>."'
@@ -42,7 +42,7 @@ if $ARGS[0] = 'bj1':
 
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution', 'deepthroat'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'<<$boydesc>> groans, clearly enjoying himself. He stands up, grabs you by the hair, and begins fucking your mouth. "Wider, you little slut, I don''t want to feel any teeth."'
 		'Not daring making him more upset you make sure your teeth don''t get in the way and open your mouth as wider.'
@@ -89,7 +89,7 @@ if $ARGS[0] = 'bj2':
 
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'Your tongue is giving every bit of his cock it can reach its attention as you bob your head back and forth.'
 		'Your lust takes over and you take him as deep into your mouth as you can, keeping him there until you start to gag and have to come up for air. Taking few breaths to recover, you take him inside again, rapidly moving your head, sucking and deepthroating him for all you''re worth.'
@@ -122,7 +122,7 @@ if $ARGS[0] = 'bj2':
 		else
 			'<<$boydesc>> lies down on his back and begins playing with his cock waiting for you to straddle him.'
 			act 'Ride him':gt 'BelSex', 'cowgirl'
-		end 
+		end
 	end
 end
 
@@ -133,10 +133,10 @@ if $ARGS[0] = 'bj3':
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<picrand>>.mp4"></video></center>'
 	'"Get down on your knees!" he commands. Unfazed by his boldness, you kneel down in front of him and lick up and down his length a few times before you take his <<dick>> cm cock into your mouth. As his cock enters, a rank odor enters your nostrils. You disregard the nasty aroma and begin moving your tongue around the head and you suck his dick as you start bobbing your head up and down while your hands take turns playing with his hairy balls. It''s hard for you to decide whether you want to move slowly and tease him, or speed up to avoid getting caught, but what you are doing seems to be to his liking.'
 	'"Good girl", he whispers, "I knew you could suck cock as soon as I saw you." His praise causes you to smile a little around his dick and you take him a little deeper in response.'
-	
+
 	gs 'arousal', 'bj', 10, 'sub', 'prostitution', 'deepthroat'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		'<<$boydesc>> is grimacing, enjoying himself. He is sitting down, letting you do all the work. Encouraged, you take his cock deeper, trying to hold it down as long as possible.'
 		'"Good girl, keep on sucking my cock." All of a sudden his cock gets stiffer and he pulls out of your mouth. "I''m ready to cum..." You move your head towards his cock but he stops you...'
@@ -148,7 +148,7 @@ if $ARGS[0] = 'bj3':
 			belsexpayment = 300
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum<<picrand>>.mp4"></video></center>'
 			'Instead, <<$boydesc>> starts jerking off, telling you "I''ll be done soon, <<$pcs_nickname>>. I want you to swallow every little drop." He doesn''t last much longer and cums all over your face.'
-			'He squeezes the last few drops of sperm into your mouth and then sticks his dick in your mouth. You swallow his cum obediently and then suck his dick clean, licking every tasty inch of it you can reach. Once he goes soft in your mouth, he pulls out his cock.' 
+			'He squeezes the last few drops of sperm into your mouth and then sticks his dick in your mouth. You swallow his cum obediently and then suck his dick clean, licking every tasty inch of it you can reach. Once he goes soft in your mouth, he pulls out his cock.'
 			swallow += 1
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -181,10 +181,10 @@ if $ARGS[0] = 'vaginal1':
 	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. You land on your back, as he quickly moves in, you spread your legs. He starts touching your pussy lips with his fat fingers, you let out a moan as he penetrates you with his finger.'
 	'"That''s enough, you''re all wet and ready now." he says. He grabs hold of his penis slowly slides his member into your wet cunt, softly parting your nether lips. As your pussy walls envelops his cock you let out a soft moan.'
 	'Hanging over you, looking into your eyes he starts build up quite a bit of speed. "You''re a pretty good fuck <<$pcs_nickname>>, but I''ve had better." he says as his sweat drips all over you.'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'vaginal1':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan; "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -213,13 +213,13 @@ if $ARGS[0] = 'vaginal2':
 	sex_temp += 1
 	picrand = rand(0,7)
 	'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<picrand>>.mp4"></video></center>'
-	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. His cock, well greased from the blowjob, easily slides into your pussy.' 
+	'<<$boydesc>> lifts you up, grabs you by the hair, and shoves you onto the bed. His cock, well greased from the blowjob, easily slides into your pussy.'
 	'You feel his glans stretching the inner walls of your pussy and you let out a loud moan with each penetration. As he keeps fucking you it doesn''t take long before you get accustomed to his movements.'
 	'"Let''s see how deep I can go," he says as he rams his cock so deep that your pubes touch. You scream out loud, breathing fast and heavily and he continues pounding you.'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'vaginal2':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -251,10 +251,10 @@ if $ARGS[0] = 'doggy':
 	'With his cock rock hard and nicely wet he lifts your body, turns you around, and tells you to get on all fours on the floor. He gets down on his knees. Streching your butt cheeks slowly, he runs his shaft along your wet pussy, teasing you, all of a sudden he shoves his cock into your pussy and starts pounding away, not caring about your enjoyment. He just wants to fuck.'
 	'Holding you by the hips, he pounds on without slowing the pace, only occasionally stopping to catch a breath. "Isn''t he going to slow down soon?" you think to yourself. But you''ve underestimated him, instead he grabs your hair and pushes himself even deeper inside.'
 	'You moan loudly as he rams his cock deeper and deeper. You hear him panting and grunting he must''ve reached his limit...'
-	
+
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -274,7 +274,7 @@ if $ARGS[0] = 'doggy':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -286,11 +286,11 @@ if $ARGS[0] = 'cowgirl':
 	'<<$boydesc>> lies on the bed. He smirks as he tells you that you''ll be doing all the work today. You look at him, still a bit confused after the blowjob you''ve given him. Wasn''t that enough? "Don''t waste my time <<$pcs_nickname>>. Come here!" Not daring to do upset him even more, you crawl on top of <<$boydesc>> and guide his cock inside your vagina.'
 	'He grabs your hips, controlling the rhythm as you to ride him. He wants it fast. Fast, deep and hard, without any regard to you, or that he actually bumps into your cervix in this position. You keep riding him at the same rhythm as he moves his hands grabbing you breasts instead.'
 	'Unable to think of anything but the pleasure, you moan so loudly that you are almost screaming. Wanting to ride out this intense feeling, you completely forget that you''re supposed to please <<$boydesc>> as you orgasm while riding him.'
-	
-	$orgasm_or = 'yes' 
+
+	$orgasm_or = 'yes'
 	gs 'arousal', 'vaginal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', '', 'A113', 1
 		gs'stat'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'cowgirl':
 		else
 			'<<$boydesc>> pulls out of your pussy as the sensations make you moan. "Oh don''t worry sweetheart, I''m not done yet. It''s your asshole next. Assume the position."'
 			act'Get fucked from behind':gt 'BelSex', 'analdoggy'
-		end 
+		end
 	end
 end
 
@@ -320,10 +320,10 @@ if $ARGS[0] = 'anal1':
 	'<center><video autoplay loop src="images/shared/sex/anal/piledriver/kotovsexanal36.mp4"></video></center>'
 	'<<$boydesc>> begins rubbing the tip of his dick against you anus. Before you can even protest, his <<dick>> cm cock has already painfully penetrated your ass. You instinctively want to flinch away, but he grabs your hips with surprising strength and forces his dick as far into your ass as he can... before he starts hammering away.'
 	'"All the other girls I''ve fucked over the years loved getting their ass destroyed," he informs you between slaps of flesh against flesh. "I hope you don''t mind." The only response you manage to let out is a little squeak as if you''re giving him permission to continue on, not that he needs it.'
-	
+
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution', 'rough'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
@@ -331,7 +331,7 @@ if $ARGS[0] = 'anal1':
 		picrand = rand(1,2)
 		'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumanal<<picrand>>.mp4"></video></center>'
 		'You can tell <<$boydesc>> is close to his orgasm. He huffs and puffs quite heavily now. Seconds later he firmly grabs your hips, his movements more erratic, and you feel his cock spasming inside you as he shoots his cum deep inside your asshole. The cum feels kind of warm inside you, and it slowly dribbles from you asshole once he pulls out his cock.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -343,17 +343,17 @@ if $ARGS[0] = 'anal2':
 	'<center><video autoplay loop src="images/shared/sex/anal/cowgirl/kotovsexanal<<picrand>>.mp4"></video></center>'
 	'<<$boydesc>> lies on the bed, as you climb on top of him. <<$boydesc>> grabs hold of his cock, guiding his cock inside your tight anus.'
 	'You gasp as you start moving back and forth, controlling the rhythm as you ride him. First, slowly, as you adjust yourself. Soon enough you''re speeding up: fast, deep, and hard. You feel a sharp pain that quickly turns into a pleasant ache. You keep riding him at the same pace as he begins panting more and more.'
-	
+
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
 		belsexpayment = 600
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/analcum.jpg"></center>'
 		'You can tell <<$boydesc>> is close to his orgasm. His cock is stiff and has gotten larger inside your anus. Seconds later he firmly grabs your hips and you feel his cock spasming inside you as he shoots his cum deep inside your asshole. The cum feels kind of warm inside you, and it slowly dribbles out as you get up off of him.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -368,14 +368,14 @@ if $ARGS[0] = 'analdoggy':
 
 	gs 'arousal', 'anal', 15, 'sub', 'prostitution'
 	gs 'stat'
-	
+
 	if belact <= 0:
 		gs 'cum_call', 'anus', 'A113', 1
 		gs'stat'
 		belsexpayment = 600
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/analcreampie/kafeanpie.jpg"></center>'
 		'You''re at your limit and just as you want to beg him to take it easier, you feel him twitching behind you. All of a sudden you feel his warm cum shooting inside you. It slowly dribbles down your thighs as he pulls out of you.'
-		
+
 		act'Take a shower':gt 'BelSex', 'shower'
 	end
 end
@@ -384,6 +384,7 @@ if $ARGS[0] = 'shower':
 	'<<$boydesc>> is finally done with you. He looks at you all pleased as you get up and head off to the bathroom to take a quick shower and freshen up.'
 	act 'Take a 15 minute shower':
 		cls
+		noShampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pav_prostitute += 1
@@ -400,7 +401,7 @@ if $ARGS[0] = 'shower':
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-	
+
 			if belgangPay <= 0:
 				money += belsexpayment
 				'Vadim looks at you and says: "That was a good fuck, <<$pcs_nickname>>. Here, this is for you," and with those words he hands you <<belsexpayment>> <b>₽</b>.'
@@ -417,12 +418,12 @@ if $ARGS[0] = 'shower':
 					'You have reduced your next weeks payment by: <<-1*belgangPayWeek>> <b>₽</b>'
 				end
 			end
-						
+
 			if $clothingworntype = 'swimwear': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-								
+
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave': gt $loc
 		end
 	end

+ 1 - 1
locations/FedorEv2.qsrc

@@ -519,7 +519,7 @@ if $ARGS[0] = 'Virgin Sex':
 						gs 'cum_call', 'stomach', $boy, 1
 						gs'stat'			
 						
-						act 'Shower':gt 'FedorEv2', 'Wash Up'
+						act 'Take a shower':gt 'FedorEv2', 'Wash Up'
 					end					
 				end				
 			end			

+ 10 - 4
locations/FedorEv4.qsrc

@@ -2165,7 +2165,7 @@ if $ARGS[0] = 'Bedroom 2':
 				gs 'arousal', 'end'
 				gs'stat'
 
-				act 'Shower':gt 'FedorEv4', 'Bedroom'
+				act 'Take a shower':gt 'FedorEv4', 'Bedroom'
 			end
 			if FedorLoveTalk = 1:
 				act 'Inside me':
@@ -2236,6 +2236,8 @@ if $ARGS[0] = 'Shower 2':
 	gs'stat'
 	'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 	'You climb into the shower and begin lathering your body, cleaning yourself as thoroughly as possible until you can hear Fedor enter the room and you peek out of the curtain to see him taking a piss and as soon as he notices you, he gives you a wink with a mischievous grin on his face.'
+	noShampoo = 1
+	dynamic $showerdin
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
 	act 'Invite him in':
@@ -2364,7 +2366,7 @@ if $ARGS[0] = 'Shower 2':
 						gs 'arousal', 'end'
 						gs'stat'
 
-						act 'Shower':gt 'FedorEv4', 'Shower'
+						act 'Take a shower':gt 'FedorEv4', 'Shower'
 					end
 					if FedorLoveTalk = 1:
 						act 'Inside me':
@@ -2382,7 +2384,7 @@ if $ARGS[0] = 'Shower 2':
 							gs 'arousal', 'end'
 							gs'stat'
 
-							act 'Shower':gt 'FedorEv4', 'Shower'
+							act 'Take a shower':gt 'FedorEv4', 'Shower'
 						end
 					end
 				end
@@ -2416,7 +2418,11 @@ if $ARGS[0] = 'Bathroom':
 
 		if WithFedor = 0:
 			act 'Leave bathroom':gt 'FedorEv4', 'Hallway'
-			act 'Take a shower (0:15)':gt 'FedorEv4', 'Shower'
+			if shampoo > 0:
+				act 'Take a shower (0:15)':gt 'FedorEv4', 'Shower'
+			else
+				'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+			end
 		else
 			act 'Take a shower':gt 'FedorEv4', 'Shower 2'
 		end

+ 22 - 16
locations/Gadbana.qsrc

@@ -46,7 +46,7 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart: 
+			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
 				grandma_trouble += 1
@@ -63,7 +63,7 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			if gadbana_stripping ! daystart: 
+			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
 				grandma_trouble += rand(0,1)
@@ -89,6 +89,7 @@ if mira = 0:
 					menu_off = 1
 					minut += 120
 					pcs_sweat = rand(0,5)
+					noShampoo = 1
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
@@ -117,21 +118,25 @@ if mira = 0:
 	end
 	*nl
 
-	act 'Wash your body (0:25)':
-		cls
-		menu_off = 1
-		minut += 25
-		dynamic $showerdin
-		if frost > 0:frost = 0
-		!!gs 'clothing', 'strip', 'Gadbana'
-		gs 'clothing', 'strip'
-		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
-		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+	if shampoo > 0:
+		act 'Wash your body (0:25)':
+			cls
+			menu_off = 1
+			minut += 25
+			dynamic $showerdin
+			if frost > 0:frost = 0
+			!!gs 'clothing', 'strip', 'Gadbana'
+			gs 'clothing', 'strip'
+			if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
+			'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-		act 'Finish':gt $loc, $metka
+			act 'Finish':gt $loc, $metka
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	dynamic $bteeth
@@ -260,6 +265,7 @@ else
 			gs 'stat'
 			act 'Steam':
 				cls
+				noShampoo = 1
 				dynamic $showerdin
 				pcs_hairbsh = 0
 				pcs_makeup = 1

+ 12 - 12
locations/IrinaRoom.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'kiss':
 
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Sex':gt 'IrinaRoom', 'sex'
 end
 
@@ -108,24 +108,24 @@ if $ARGS[0] = 'sex':
 
 	if pcs_horny < 50:
 		'Once in bed you caress each other with passion and lick each others wet pussies. But the excitement gradually disappears and you feel that you won''t orgasm this time.'
-		
+
 		$orgasm_or = 'no'
 		gs 'arousal', 'cuni', 60, 'lesbian'
 		gs 'arousal', 'cuni_give', 60, 'lesbian'
 		minut -= 60
 		gs 'stat'
-		
+
 	end
 
 	if pcs_horny >= 50:
 		'Once in bed you caress each other with passion and lick each others wet pussies. Finally you are both satisfied.'
-		
+
 		$orgasm_or = 'yes'
 		gs 'arousal', 'cuni', 60, 'lesbian'
 		gs 'arousal', 'cuni_give', 60, 'lesbian'
 		minut -= 60
 		gs 'stat'
-		
+
 	end
 
 	act 'Leave':
@@ -160,7 +160,7 @@ if $ARGS[0] = 'first3':
 
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Ira undress':gt 'IrinaRoom', 'first4'
 	act 'Ira drink more':gt 'IrinaRoom', 'first5'
 end
@@ -191,13 +191,13 @@ if $ARGS[0] = 'first5':
 	'You pumped Ira with wine, she is highly intoxicated and spilled wine on myself. She went into the bathroom to change. You, too, went in and offered to help her.'
 	'She undresses and you have decided to follow suit and after undressing climb into the shower. You start lathering her body and see that she is flushed and her nipples erect.'
 	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
+	noShampoo = 1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 
 	gs 'arousal', 'foreplay', 10, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Kiss':gt 'IrinaRoom', 'first6'
 end
 
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first6':
 
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Fondle breasts':gt 'IrinaRoom', 'first7'
 end
 
@@ -225,7 +225,7 @@ if $ARGS[0] = 'first7':
 
 	gs 'arousal', 'breasts', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Lick pussy':gt 'IrinaRoom', 'first8'
 end
 
@@ -245,7 +245,7 @@ if $ARGS[0] = 'first8':
 	gs 'arousal', 'cuni_give', 10, 'lesbian'
 	minut -= 10
 	gs 'stat'
-	
+
 	act 'Enjoy':gt 'IrinaRoom', 'first9'
 end
 
@@ -262,7 +262,7 @@ if $ARGS[0] = 'first9':
 	$orgasm_or = 'yes'
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	gs 'stat'
-		
+
 	act 'Leave':
 		cla
 		minut += 5

+ 3 - 0
locations/KatjaHomeTalk.qsrc

@@ -21,6 +21,7 @@ if $ARGS[0] = '':
 
 				act 'Wash alone':
 					cls
+					noShampoo = 1
 					dynamic $showerdin
 					minut += 15
 					pcs_horny += 1
@@ -42,6 +43,7 @@ if $ARGS[0] = '':
 				if mesec <= 0:
 					act 'Bathe together':
 						cls
+						noShampoo = 1
 						dynamic $showerdin
 						minut += 15
 						pcs_horny += 1
@@ -105,6 +107,7 @@ if $ARGS[0] = '':
 					end
 				end
 			elseif KatjaHorny < 50:
+				noShampoo = 1
 				dynamic $showerdin
 				minut += 15
 				pcs_horny += 1

+ 13 - 12
locations/LBZhouse.qsrc

@@ -4,7 +4,7 @@ CLOSE ALL
 $LBZH_sex={
 	act 'Give up your pussy':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,7)
 		!'<<mrapic>>'
 		'<center><video autoplay loop src="images/characters/pavlovsk/vadim/sex/mitka<<mrapic>>.mp4"></video></center>'
@@ -19,14 +19,14 @@ $LBZH_sex={
 $LBZH_anal={
 	act 'Give up your ass':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,7)
 		!'<<mrapic>>'
 		'<center><video autoplay loop src="images/shared/sex/anal/doggy/anal<<mrapic>>.mp4"></video></center>'
 		''
 		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
-		
+
 		spafinloc = 3
 		gs 'cum_manage'
 		'<<$boydesc>> groaned and came filling your ass with his warm sperm.'
@@ -38,7 +38,7 @@ $LBZH_anal={
 $LBZH_bj={
 	act 'Suck':
 		cls
-		gs'stat' 
+		gs'stat'
 		mrapic=rand(0,12)
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<mrapic>>.mp4"></video></center>'
 		'You take a cock in your mouth and start sucking it. You get busy working up and down his dick with your mouth. Your lips lock tightly around his shaft while your tongue licks and plays with his dick.'
@@ -46,7 +46,7 @@ $LBZH_bj={
 
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
-			
+
 		 act 'Swallow':
 			cls
 			swallow += 1
@@ -61,7 +61,7 @@ $LBZH_bj={
 
 			act 'Finish':dynamic $LBZH_end
 		end
-	 
+
 		dynamic $LBZH_sex
 		dynamic $LBZH_anal
 	end
@@ -75,6 +75,7 @@ $LBZH_end={
 
 	act 'Wash in the shower':
 		cls
+		noShampoo = 1
 		dynamic $showerdin
 		minut += 15
 		pcs_horny = pcs_horny + 1
@@ -90,8 +91,8 @@ $LBZH_end={
 			cls
 			gs'stat'
 			'After you are done washing you get dressed and blow <<$boydesc>> a kiss before you leave.'
-			
-			
+
+
 			act 'Leave':
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -120,20 +121,20 @@ act 'Sex':
 	if tiprand<=70:
 		'<<$boydesc>> gently pushes your shoulders down and you kneel in front of him, waiting for his hard shaft.'
 		dynamic $LBZH_bj
-	     
+
 		act 'Masturbate':
 			cls
 			temp_hj+=1
 			temp_guy+=1
-			gs'stat' 
+			gs'stat'
 			mrapic=0
 			'<center><video autoplay loop src="images/shared/sex/handjob/hj<<mrapic>>.mp4"></video></center>'
 			'You immediately take his cock in your hand and start jerking him off.'
 			'Soon <<$boydesc>> starts to pant heavily and moans out. "<<$pcs_nickname>>, I''m about to cum."'
-			
+
 			gs 'arousal', 'hj', 5, 'sub'
 			gs 'stat'
-			
+
 			dynamic $LBZH_sex
 			dynamic $LBZH_anal
 		end

+ 10 - 2
locations/VoltrenerSexShower.qsrc

@@ -123,7 +123,11 @@ if $ARGS[0] = '3':
 				gs 'arousal', 'flash', 10
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Wash your ass':dynamic $showerdin & gt 'gdksport', 'start'
+				act 'Wash your ass':
+					noShampoo = 1
+					dynamic $showerdin
+					gt 'gdksport', 'start'
+				end
 			end
 			act 'Cover up':
 				cls
@@ -132,7 +136,11 @@ if $ARGS[0] = '3':
 				'Mikhail Nikolaevich gives you an evil look, "Prokhorov fucks your ass and you scream with joy, but your coach just wants to alleviate some tension and you curl up all scared?"'
 				'You can see from the look in his eyes that he''s been at the wine and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 				gs 'stat'
-				act 'Wash your ass':dynamic $showerdin & gt 'gdksport', 'start'
+				act 'Wash your ass':
+					noShampoo = 1
+					dynamic $showerdin
+					gt 'gdksport', 'start'
+				end
 			end
 		end
 	end

+ 19 - 8
locations/abduction.qsrc

@@ -49,12 +49,20 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	vitamin_bak = vitamin
 	kosmetica_bak = kosmetica
 	lipbalm_bak = lipbalm
+	tampon_bak = tampon
+	shampoo_bak = shampoo
+	stanok_bak = stanok
+	deodorant_bak = deodorant
 
 	painkiller = 0
 	prezik = 0
 	vitamin = 0
 	kosmetica = 0
 	lipbalm = 0
+	tampon = 0
+	shampoo = 0
+	stanok = 0
+	deodorant = 0
 
 	tabletkishot = rand(84,91)
 	shotdays = 84
@@ -523,6 +531,10 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	vitamin = vitamin_bak
 	kosmetica = kosmetica_bak
 	lipbalm = lipbalm_bak
+	tampon = tampon_bak
+	shampoo = shampoo_bak
+	stanok = stanok_bak
+	deodorant = deodorant_bak
 
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'Nord'
@@ -626,20 +638,15 @@ if $ARGS[0] = 'abdFood':
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	act 'Take a cold shower (0:15)':
-		cumspclnt = 1
-		gs 'cum_cleanup'
-		if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-
 		*clr & cla
 		menu_off = 1
-		shampoo -= 1
 		minut += 15
 		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
+		noShampoo = 1
+		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'
-		'The shower is cold but at least you got clean again...'
+		'The shower is cold and you don''t have any shampoo, but at least you got clean again...'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		act 'Get back':gt 'abduction', 'abdFood'
 	end
@@ -1047,6 +1054,10 @@ if $ARGS[0] = 'abdSoldSauna':
 	vitamin = vitamin_bak
 	kosmetica = kosmetica_bak
 	lipbalm = lipbalm_bak
+	tampon = tampon_bak
+	shampoo = shampoo_bak
+	stanok = stanok_bak
+	deodorant = deodorant_bak
 
 	act 'Continue':gt 'sauna', 'saunaroom'
 end

+ 1 - 0
locations/albinahome.qsrc

@@ -289,6 +289,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 						act 'Get in the shower (0:15)':
 							*clr & cla
+							noShampoo = 1
 							dynamic $showerdin
 							minut += 15
 							! WD: Remove old Cheat code

+ 1 - 0
locations/anushapt.qsrc

@@ -346,6 +346,7 @@ if $ARGS[0] = 'bathroom':
 		*clr & cla
 		menu_off = 1
 		minut += 10
+		noShampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		temp = rand(0,4)

+ 14 - 13
locations/backwater.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = '':
 	act 'Go back to the hut':minut += 5 & gt'swamp_yard'
 
 	'<center><B>Backwater</B></center>'
-	
+
 	if month >= 4 and month <= 10:
 		if hour >= 6 and hour < 22:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwater.jpg"></center>'
@@ -30,16 +30,17 @@ if $ARGS[0] = '':
 		end
 	end
 	*nl
-	
+
 	'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
 	*nl
 	if clothesAtLocation = 1:'Your clothes lie on the shore.'
-	
+
 	if $clothingworntype = 'nude':
 		act 'Wash self':
 			cla
 			*clr
 			menu_off = 1
+			noShampoo = 1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0
@@ -48,7 +49,7 @@ if $ARGS[0] = '':
 			pcs_willpwr += 5
 			inhib_exp += rand(1,3)
 			if huntersRape = 1: huntersRape = 2
-	
+
 			if $pantyworntype = 'none':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim2.jpg"></center>'
 			else
@@ -74,7 +75,7 @@ if $ARGS[0] = '':
 			minut += 10
 			if huntersRape = 1: huntersRape = 2
 			gs 'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterswim1.jpg"></center>'
 			*nl
 			'You carefully wash off the sperm in the creek.'
@@ -90,11 +91,11 @@ if $ARGS[0] = '':
 			face_write = 0
 			minut += 10
 			gs'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash1.jpg"></center>'
 			*nl
 			'You wash off the indecent inscriptions on your body.'
-	
+
 			act 'Finish':menu_off = 0 & gt $loc, $metka
 		end
 	end
@@ -108,15 +109,15 @@ if $ARGS[0] = '':
 			minut += 10
 			if huntersRape = 1: huntersRape = 2
 			gs'stat'
-	
+
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/cumwash.jpg"></center>'
 			*nl
 			'You clean the cum stains off your clothes.'
-	
+
 			act 'Finish':gt 'backwater'
 		end
 	end
-	
+
 	if spdirty > 0:
 		act 'Quick wash (0:15)':
 			cla
@@ -138,7 +139,7 @@ if $ARGS[0] = '':
 			act 'Finish':gt 'backwater'
 		end
 	end
-	
+
 	if clothesAtLocation = 0:
 		if $clothingworntype ! 'nude' and temper >= 15:
 			act'Get undressed':
@@ -149,7 +150,7 @@ if $ARGS[0] = '':
 					minut+=5
 					gs 'underwear', 'remove'
 					if huntersRape = 1: huntersRape = 2
-	
+
 					if CloSkirtShortness > 0:
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/backwaterundress_ski.jpg"></center>'
 					else
@@ -191,7 +192,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	
+
 end
 
 if $ARGS[0] = 'creekside_relax':

+ 17 - 13
locations/brothel.qsrc

@@ -513,7 +513,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	 *nl
 	'A room made for the working girls, like yourself.'
 	'It is equipped with a shower, almost on every wall hangs a large <a href="exec:gt ''mirror'', ''start''">mirror</a>. There is a water cooler beside the door, and some light snacks on the table, in case the girls get hungry or thirsty between sessions.'
-	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+	'In a box beneath a table you can take some '+iif(kosmetica < 1,'<a href="exec: kosmetica += 5 & gt ''brothel'', $metka">cosmetics</a>','cosmetics')+' (you have '+kosmetica+') or, '+iif(shampoo < 1,'<a href="exec: shampoo += 5 & gt ''brothel'', $metka">shampoo</a>','shampoo')+', '+iif(lipbalm < 1,'<a href="exec: lipbalm += 5 & gt ''brothel'', $metka">lip balm</a>','lip balm')+' (you have '+lipbalm+'), or '+iif(stanok < 1,'<a href="exec: stanok += 5 & gt ''brothel'', $metka">shaving</a>','shaving')+' equipment (you have '+stanok+'), if you don''t have any. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'For obvious reasons there is also a box with an '+iif(klisma < 1,'<a href="exec: klisma += 1 & gt ''brothel'', $metka">enema kit</a>','enema kit')+'. A box with some '+iif(painkiller < 1,'<a href="exec: painkiller += 5 & gt ''brothel'', $metka">painkillers</a>','painkillers')+' (you have '+painkiller+') is there, in case someone needs pain relief.'
 	'On the table lies a list with instructions, in case you don''t already remember them:'
 	*nl
@@ -533,18 +533,22 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	act 'Have a glass of water (0:05)':gs 'beverage', 'bev_wat'
 	act 'Change your clothes':gt 'wardrobe', 'start'
 	act 'Look in the mirror': gt 'mirror', 'start'
-	act 'Have a shower':
-		cls
-		dynamic $showerdin
-		gs 'stat'
-		'<h3>Girl room</h3>'
-		'<h5>Shower</h5>'
-		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
-		''
-		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		dynamic $dryOff
-		if stanok > 0: dynamic $brit
+	if shampoo > 0:
+		act 'Have a shower':
+			cls
+			dynamic $showerdin
+			gs 'stat'
+			'<h3>Girl room</h3>'
+			'<h5>Shower</h5>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
+			''
+			'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible to potential clients.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			dynamic $dryOff
+			if stanok > 0: dynamic $brit
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $toymanage

+ 12 - 11
locations/brother_voyeur.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'showertalk1':
 		'"Of course not silly! I''m not even mad! I just wanted to catch up with my favorite little brother and I thought, since you were right there, why not now?"'
 		'"Oh, okay..." he nods, still looking away.'
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,3)
-		
+
 		if pcs_inhib >= 40 or npc_rel['A34'] >= 90:
 			act'"You can look at me you know"':
 				npc_rel['A34'] += 5
@@ -153,7 +153,7 @@ if $ARGS[0] = 'showertalk2':
 			npc_rel['A34'] += 5
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
-			
+
 			'"Kolka..." When you say this he starts to turn towards you a little bit but then stops himself and continues to stare at the wall. You sigh sympathetically. "It''s okay to look at me you know."'
 			'He perks up and turns towards you slowly. "R-really?" His wide eyes rapidly flit between your face, your breasts, your <<$pcdesc_pubes>> pussy, the walls, and the floor, unable to make up his mind of where he should be looking.'
 			'"Yes really!" you laugh. "Yeah, yeah, I know. I''ve got boobs. I''ve got a pussy instead of a penis. I know it''s strange and distracting and all that, but you''re my brother and I love you! I don''t want to have to share my conversations between you and the wall. So, I don''t mind you looking. If it means I can spend this time getting closer to you, you can look all you want. Okay?"'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'showertalk2':
 			if brothershowertalk <= 5:
 				'You casually chat with him about how he''s doing in school while you shower. He sits on the toilet seat and faces away from you, awkwardly answering all your questions and queries, but you still see him occasionally stealing glances at your naked body. Not that it bothers you any, as you simply smile to yourself, amused that he thinks he''s still being sneaky.'
 				act'Continue':gt'brother_voyeur','shave'
-				
+
 			elseif brothershowertalk > 5:
 				'He energetically talks to you about school and how it''s going for him, though he still sits on the toilet facing away. He also still takes a few looks at you now and again but they aren''t as sneaky and they mostly seem to be glances to see your face. <i>Not that his eyes don''t wander downward anyways...</i> you notice with a smile.'
 				brothershowerschooltalk = rand(1,3)
@@ -222,7 +222,7 @@ if $ARGS[0] = 'showertalk2':
 					elseif pcs_grades < 50:
 						'"Blegh! Yeah, you''re right. Math sucks!" you grumble in agreement.'
 					end
-					
+
 					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerschooltalk = 2:
@@ -271,7 +271,7 @@ if $ARGS[0] = 'showertalk2':
 					act'Continue':gt'brother_voyeur','shave'
 
 				elseif brothershowerfriendtalk = 3:
-					'"... I wish I had more time to play football with Zhendos and Mishan though," he says, snapping you out of your idle thoughts and bringing you back to the room. "I can''t do anything with them when <<$npc_nickname[''A29'']>> is dragging us to Gadukino every other weekend."'
+					'"I wish I had more time to play football with Zhendos and Mishan though," he says, snapping you out of your idle thoughts and bringing you back to the room. "I can''t do anything with them when <<$npc_nickname[''A29'']>> is dragging us to Gadukino every other weekend."'
 					*nl
 					if seepornofut = 0:
 						'"It''s okay Kolka," you console him. "Just enjoy the time you have with them. In a couple years <<$npc_nickname[''A29'']>> might not force you to go anymore but you all might end up too busy to hang out."'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'showertalk2':
 				end
 			end
 		end
-		
+
 		if pcs_horny >= 55:
 			act'Use the showerhead on your pussy':
 				cla & *clr
@@ -330,7 +330,7 @@ if $ARGS[0] = 'showertalk2':
 							'As your orgasm winds down, you breathe deeply and glance upward towards your brother. You quickly stiffen up when you see what looks to be like the finishing movements of his shoulders turning back forward. Were you so caught up in pleasure that you didn''t notice that he was watching you masturbate in front of him?'
 							'You gulp and try to continue the conversation normally. His responses seem more or less the same and the conversation doesn''t seem to be any different other than a burning in your cheeks. Maybe he didn''t see anything after all? But you can''t be sure...'
 						end
-						
+
 						if pcs_pubes >= 4 or pcs_leghair >= 4:
 							act'Continue':gt'brother_voyeur','shave'
 						else
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'brother_shower_end':
 			end
 		end
 	end
-	
+
 	act'Kick him out':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
@@ -2334,7 +2334,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'"But that''s not fair! So what I want doesn''t count for anything?"'
 				'"Nope! But I get to decide if I''m feeling generous."'
 				'With Kolka''s hands balled into fists at his side and your hands on your hips, the two of you glare at each other, scowling. This turned into a much bigger argument than you meant it to.'
-				if succubusflag = 0:	
+				if succubusflag = 0:
 					if knowpreg = 1 or thinkpreg = 1:
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
@@ -2355,7 +2355,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				'"I''m sorry Kolka! Your cock just felt so good, I couldn''t stop! You can''t be mad at me for being too addicted to your cock to stop, right?" You kneel down, trying to apologize by cleaning him up with your tongue.'
 				'He grumbles a bit but you can tell that he''s not mad at you. "I guess I can''t be mad about that... But next time I ask, I want to cum on your face!"'
 				'"Okay, it''s a promise!" you say, standing back up and kissing him on the cheek. "So long as I can stop myself that is."'
-				if succubusflag = 0:	
+				if succubusflag = 0:
 					if knowpreg = 1 or thinkpreg = 1:
 						'You chuckle to yourself: "Well, at least I can''t get any more pregnant than I already am!"'
 					elseif pillcon >= 30000 or tabletkishot >= 1:
@@ -2370,7 +2370,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 				end
 				act'Continue':gt'brother_voyeur','brother_shower_fuck_end'
 			end
-			
+
 			if succubusflag = 0:
 				act'Too much mess':
 					cla
@@ -2475,6 +2475,7 @@ end
 
 if $ARGS[0] = 'brother_shower_fuck_end':
 	cla & *clr
+	noShampoo = 1
 	dynamic $showerdin
 	brother_shower_times += 1
 	minut += 2

+ 39 - 36
locations/buklinik_event.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = 'pos8':
 	*clr
     medcn_exp += rand (0,3)
 	if bumtolik = 8:bumtolik = 9
-     
+
 	buklinikDay = daystart
 	minut += 120
 	pcs_mood += 20
@@ -183,11 +183,11 @@ end
 
 !events from 1.2.4
 ! nanny_act - action''s counter
-! nanny_cleaning 
+! nanny_cleaning
 ! nanny_food
 ! nanny_story
 ! nanny_vika
- 
+
 ! --- LOCATIONS --- !
 if $ARGS[0] = 'hall':
 	cls
@@ -232,7 +232,7 @@ if $ARGS[0] = 'room':
 	end
 	'<a href="exec:gt ''buklinik_event'',''misha''">Michael</a> lying in bed and reading a book.'
 
-	act 'Out': gt 'buklinik_event', 'hall'	
+	act 'Out': gt 'buklinik_event', 'hall'
 end
 
 if $ARGS[0] = 'kitchen':
@@ -298,7 +298,7 @@ if $ARGS[0] = 'vika':
 		'- So Far, Vic.'
 		'Well, I guess I gotta go to Michael, thought you.'
 		act 'For the work': gt 'buklinik_event', 'hall'
-	end	
+	end
 
 	act '<B>Depart</B>': gt 'buklinik_event', 'hall'
 end
@@ -318,7 +318,7 @@ if $ARGS[0] = 'misha':
 		$zz_str[0] = 'You were talking with Michael I learned that he was born in Pavlovo, in the same way as you. His family moved to here when he was seven. The family had four children, he is a senior. He says he often remembers about the life he''d led before he contracted polio.'
 		$zz_str[1] = 'At an early age I died a sister, Anastasia, died of pneumonia, then for several years I suffered from poliomyelitis, and since then I couldn''t shake the feeling of guilt. It seemed to him that the parents, especially the mother, had paid him too much attention and didn''t notice that Karen needs help until it is too late. There was nothing to show that his fears are justified but to get rid of feelings of guilt, Mikhail was not able.'
 		$zz_str[2] = 'He explains that in his childhood loved to play with the neighborhood children... But the disease hit me when I was six years old, and I immediately became the main concern of his family, especially the mother. She''s totally dedicated to me. Throughout the early years of my life she fed me with unfailing kindness and patience.'
-		$zz_str[3] = 'Despite the physical difficulties which had to be overcome, Michael received a diploma in English language at University, and his poems and articles were published. He worked on a word processor with a stick, which was holding my mouth. The master''s degree he was going to get the specialty of the reporter, but soon began to the consequences of poliomyelitis affecting muscles. From study had to be abandoned.'	
+		$zz_str[3] = 'Despite the physical difficulties which had to be overcome, Michael received a diploma in English language at University, and his poems and articles were published. He worked on a word processor with a stick, which was holding my mouth. The master''s degree he was going to get the specialty of the reporter, but soon began to the consequences of poliomyelitis affecting muscles. From study had to be abandoned.'
 		$zz_str[4] = 'You talk with Michael, he told you about "iron lung", this device allows him to breathe, but he can do without it for several hours using a portable respirator and it depends on how he feels.'
 		$zz_str[5] = 'You talk with Michael, he told you that he''s not that lame, just it not work the muscle.'
 		$zz_str[6] = '- Are you a believer? - he asked you. - Yes not particularly, as it. - answered you. - And I still believe, '' he said. - I though of someone to blame it all on what was happening to me. - with a smile he said.'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'event0':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
 
 	'- The fact that we need to send a nurse to one special person, his name is Misha, he is disabled.'
-	'Most of his thirty-six years Michael spent inside of a device called «iron lung», after six years ill with polio.' 
+	'Most of his thirty-six years Michael spent inside of a device called «iron lung», after six years ill with polio.'
 	'He alone can breathe only a short time, he constantly needs breathing apparatus.'
 	'- Wow! - answered you in surprise.'
 	'- In General, go to this address - there to you will explain what you need to do.'
@@ -361,7 +361,7 @@ if $ARGS[0] = 'event1':
 	medcn_exp += rand (0,3)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/vika/3.jpg"></center>'
-	'You came to the address and knocked on the door. You opened the young girl and asked: 
+	'You came to the address and knocked on the door. You opened the young girl and asked:
 	- You from the clinic of mercy?'
 	'- Yes. - you replied, looking at the girl, she had pokazalas you are quite cute . She was invited to enter.'
 	act 'Enter':
@@ -394,8 +394,8 @@ if $ARGS[0] = 'event1':
 	- Well, okay, then, I went as Michael. - she kissed him on the forehead man. - Before, Dating Svetlana. - she waved her hand to me and closed the door.
 	- Here we are all alone. - a little sadly said Michael.'
 					act 'Don''t worry everything will be fine': gt 'buklinik_event', 'hall'
-				end		
-			end		
+				end
+			end
 		end
 	end
 end
@@ -407,11 +407,11 @@ if $ARGS[0] = 'entrance':
 	buklinikDay = daystart
 	minut += 20
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/city/vika/'+iif(ARGS[1]=0,5,3)+'.jpg"></center>'
 
 	if ARGS[1] = 0:
-		'You''ve come to the address and knocked on the door. You opened Vic. 
+		'You''ve come to the address and knocked on the door. You opened Vic.
 		- Oh, Hey, <<$pcs_nickname>>, you don''t mind that I turn to you?
 		- Yes, no, not against. - answered with a smile you.
 		- And Misha, I told you what pleasant interlocutor, and he with you like!
@@ -425,7 +425,7 @@ if $ARGS[0] = 'entrance':
 		- Well here I am. - Answered you.
 		- Let''s go. Well, I ran.'
 	end
-	
+
 	if ARGS[1] = 2 or ARGS[1] = 4:
 		'You come to Michael, the door you opened Vic.
 		- Hi, <<$pcs_nickname>>.
@@ -462,7 +462,7 @@ end
 if $ARGS[0] = 'event2':
 	act '<B>Leave</B>': gt 'buklinik_event', 'room'
 	if nanny_cleaning = 0 or nanny_food = 0: exit
-	
+
 	if MishaLove = 1:
 		act 'I am finished':
 			cls
@@ -507,7 +507,7 @@ if $ARGS[0] = 'event2':
 					act 'Listen':
 						cls
 						'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/6.mp4"></video></center>'
-						'And I decided to invite her on a picnic, and she consented.'	
+						'And I decided to invite her on a picnic, and she consented.'
 						act 'Further':
 							cls
 							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/shave.mp4"></video></center>'
@@ -699,13 +699,13 @@ if $ARGS[0] = 'event2':
 						'- As you think, you can already start, you can look at your body?'
 						'Yeah, I''d like to do.'
 						act'Undress him':
-							cls	
+							cls
 							'Now I had to undress, so I had to remove Michael''s clothes and for the first time to see his body. Suddenly I was gripped by fear. He was so fragile. What if I hurt him or do anything with his body?'
 							'- Misha, at any time, if I do something you don''t like it, let me know. Not only for our collaboration, but for you it is important to learn how to talk to your partner about how you feel. If it makes you feel bad, uncomfortable, just tell me to stop, okay?'
 							'"Okay," he replied, and his face ran a shade of anxiety.'
 							'Remember, we do it all for you, so if you want me to do something slower or stopped doing at all, just tell me about it.'
 							'You gently raised the blanket. He was dressed in a red long-sleeved shirt and black training pants. «Slowly and carefully, slowly and gently, said I to myself, as the spell. - Start with shirts». I undid the first button, and then the other until the very end. Then a button on the wrist of the left sleeve. Then, pulled out the sleeve as much as possible. The collar came down on one shoulder. It is very little time spent on the street and was very pale. Against the red fabric of the shirt his skin was as pure white as salt. I vigorously rubbed my hands together to warm them up, and slipped his hand under the shirt. You gently took his thin hand, simultaneously pulling the sleeve and putting his hand on the bed. When the sleeve was almost cleared, Michael shouted - very loudly. Oh my God! Did I hurt it?'
-							act 'Oh my God! what happened?':	
+							act 'Oh my God! what happened?':
 								cls
 								'- What happened? asked you.'
 								'"Nail, nail caught on the shirt." he said.'
@@ -729,7 +729,7 @@ if $ARGS[0] = 'event2':
 										'- I''ve never seen a naked woman, said he, stammering.'
 										'Despite a thin body, Michael had chubby cheeks, which now was covered with a pink blush.'
 										'- That''s why I''m here - you cheered him and laid next to him on the bed. - For sex brought pleasure, it is very important to be able to relax, so now I''ll show you an exercise that will help.'
-										act 'Further': 
+										act 'Further':
 											cls
 											'At this point you have decided to learn to breathe deeply, from your diaphragm, focusing exclusively on the process of breathing: a long, full breath, and immediately slow exhale. Mikhail couldn''t take deep breaths, but I still asked him to focus on the breath, even if it was difficult.'
 											'Close your eyes and try to clear your mind of everything unnecessary, to think only about breathing, you said.'
@@ -793,7 +793,7 @@ if $ARGS[0] = 'event2':
 			nanny_cleaning = 0
 			nanny_food = 0
 			nanny_act = 5
-			
+
 			bumtolik = 14
 			buklinikDay = daystart
 			gs 'stat'
@@ -811,7 +811,7 @@ if $ARGS[0] = 'event2':
 				'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/pants.mp4" ></video></center>'
 		'Haven''t stripped Michael to the end, you notice that he''s already excited. When you removed your pants, you had to pull the rubber band, because she''s touching his hard cock.'
 				act 'Undress herself':
-					cls	
+					cls
 		'You undressed.'
 					act'Lie down on the bed':
 						cls
@@ -833,7 +833,7 @@ if $ARGS[0] = 'event2':
 		- There are worse things I could choke, said Michael.
 		You slowly bent arm, twisting the hip to the left to lower the right nipple to his lips. Michael grabbed his wet mouth and drew in.
 		- It is very nice.
-		After a few seconds, you took the nipple from his lips.'		
+		After a few seconds, you took the nipple from his lips.'
 							act'You need air?':
 								cls
 		'- Do you need air? - crosely you.
@@ -847,17 +847,17 @@ if $ARGS[0] = 'event2':
 									act'Want Cooney':
 										stat['cuni'] += 1
 										cls
-		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/facesitting.mp4"></video></center>'									
+		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/facesitting.mp4"></video></center>'
 		'You told him about it. he immediately agreed. You sat on his face and began to slowly move his hips. Arousal gushed on and you reschili...'
 										act'To accelerate the pace':
 											cls
-		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/tube.mp4"></video></center>'										
+		'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/tube.mp4"></video></center>'
 		'With excitement you began, almost jumping on his face he heard:
 		- Ahem... bwhc... I can''t breathe!
 		- God, my! - you screamed.
 		- Respirator... pipes... - after saying the last word you gave him.
 		- I think it''s worth to wait for later. - you said.
-		After inhaling he asked if we could have sex. you asked him to listen to your breath, reached into my purse for a condom and quickly put it on.'								 
+		After inhaling he asked if we could have sex. you asked him to listen to your breath, reached into my purse for a condom and quickly put it on.'
 											act'Take the dick':
 												cls
 												gs 'boyStat', 'A185'
@@ -895,16 +895,17 @@ if $ARGS[0] = 'event2':
 														'So long as men can breathe or eyes can see,'
 														'So long lives this, and this gives life to thee.'
 
-														'Finished Michael.'	
+														'Finished Michael.'
 														act'That''s fine':
 															cls
 															gs'stat'
 															'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/sex/end.jpg" ></center>'
 		'- Misha, it was perfect. I want you to know how glad I am that we met and that we had a chance to help you.
-		You ran a finger along his hip and down the leg. You felt an excitement not yet experienced at all the time that you were together. You took his face in her hands and kissed her forehead'													
+		You ran a finger along his hip and down the leg. You felt an excitement not yet experienced at all the time that you were together. You took his face in her hands and kissed her forehead'
 															act'Well on this we''re finished':
 																cls
 																nanny_vika = 1
+																noShampoo = 1
 																dynamic $showerdin
 																'You take a quick shower and get dressed, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 																if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -964,7 +965,7 @@ if $ARGS[0] = 'event2':
 							gs 'boyStat', 'A185'
 							gs 'Cum_Manage'
 							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/sex.mp4" ></video></center>'
-							'You took his cock in hand and brought the head in her pussy, asking him to rate the level of arousal. First you didn''t move, and then fell down. After about a minute came the orgasm.'						
+							'You took his cock in hand and brought the head in her pussy, asking him to rate the level of arousal. First you didn''t move, and then fell down. After about a minute came the orgasm.'
 							act'Further':
 								cls
 								'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/misha.jpg" ></center>'
@@ -979,6 +980,7 @@ if $ARGS[0] = 'event2':
 									cls
 									nanny_vika = 1
 									gs'stat'
+									noShampoo = 1
 									dynamic $showerdin
 									'You take a quick shower and dress yourself and Michael, then you say goodbye to Michael and you are ready to leave. Soon Vika arrives.'
 									if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -989,7 +991,7 @@ if $ARGS[0] = 'event2':
 					end
 				end
 			end
-		end							
+		end
 	elseif nanny_act = 6 and nanny_vika = 0:
 		act'So let''s start':
 			cla
@@ -1001,7 +1003,7 @@ if $ARGS[0] = 'event2':
 			act'Further':
 				cls
 				stat['hj'] += 1
-				'You held his penis in his hands for a few minutes and he asked if he could kiss my vagina.'			
+				'You held his penis in his hands for a few minutes and he asked if he could kiss my vagina.'
 				act'Of course':
 					cls
 					'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/lick.mp4"></video></center>'
@@ -1013,7 +1015,7 @@ if $ARGS[0] = 'event2':
 						act'Suck':
 							cls
 							stat['bj'] += 1
-							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/suck.mp4"></video></center>'						
+							'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/suck.mp4"></video></center>'
 							'You suck dick'
 							act'Take the dick':
 								stat['vaginal'] += 1
@@ -1021,7 +1023,7 @@ if $ARGS[0] = 'event2':
 								gs 'boyStat', 'A185'
 								gs 'Cum_Manage'
 								cls
-								'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/anal.mp4"></video></center>'	
+								'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/sex/anal.mp4"></video></center>'
 								'You put on a condom and slide your finger on the back, easy to tighten the member by hand. You slung it over your foot to cock was inside you, and began to move, rocking. You felt the vagina begins to swell. Together with him you reached the highest point of excitation. Did you do the breath, but then stopped to ask Michael how he assessed the level of arousal.'
 								'- About eight, he said.'
 								'You quickened the pace. Michael came. His excitement lasted longer than any of our previous classes. Even after orgasm his cock was still hard, so you can make a few more movements up and down and to cum.'
@@ -1044,6 +1046,7 @@ if $ARGS[0] = 'event2':
 									act'Wait For Vika':
 										cls
 										nanny_vika = 1
+										noShampoo = 1
 										dynamic $showerdin
 										'You take a quick shower and dress yourself and Michael.'
 										if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.<br>'
@@ -1053,17 +1056,17 @@ if $ARGS[0] = 'event2':
 											cls
 											nanny_story = 1
 											bumtolik = 16
-											'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/kiss_cheek.jpg" ></center>'	
+											'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/kiss_cheek.jpg" ></center>'
 											'Goodbye, Michael.'
 											act'Go': gt'buklinik','olga2'
-										end	
+										end
 										act'A kiss on the lips':
 											cls
 											nanny_story = 1
 											bumtolik = 16
 											MishaLove = 1
-											'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/kiss_lips.mp4" ></video></center>'	
-											'Good-Bye, Micha.'	
+											'<center><video autoplay loop src="images/locations/city/industrial/mercyclinic/kiss_lips.mp4" ></video></center>'
+											'Good-Bye, Micha.'
 											act 'Go': gt'buklinik', 'olga2'
 										end
 									end
@@ -1072,7 +1075,7 @@ if $ARGS[0] = 'event2':
 						end
 					end
 				end
-			end		
+			end
 		end
 	end
 end

+ 75 - 68
locations/dimaHome.qsrc

@@ -178,58 +178,61 @@ if $ARGS[0] = 'bathroom2':
 	*nl
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
 
-	act 'Take a shower (0:15)':
-		*clr & cla
-		menu_off = 1
-		minut += 15
-		!!dynamic $showerdin
-		gs 'stat'
-		'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></center>'
-		'You decide to take advantage of the luxury shower. As the warm water flows over your entire body from the massive shower head, you feel your whole body relax in the comforting stream.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-		act 'Get out and dry off': gt 'dimaHome','bathroom2'
-	end
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			*clr & cla
+			menu_off = 1
+			minut += 15
+			dynamic $showerdin
+			gs 'stat'
+			'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
+			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></center>'
+			'You decide to take advantage of the luxury shower. As the warm water flows over your entire body from the massive shower head, you feel your whole body relax in the comforting stream.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-	act 'Soak in the bath (0:30)':
-		*clr & cla
-		menu_off = 1
-		minut += 30
-		pcs_sweat = 7 + rand(0,4)
-		pcs_mood += 20
-		pcs_skin += 1
-		if frost > 0:frost = 0
-		pcs_horny += rand(0,2)
-		!!dynamic $bath
-		gs 'stat'
-		'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
-		'<center><img src="images/shared/home/bathroom/wash4.jpg"></center>'
-		'You smile to yourself as you draw a bath in the impressive tub. You relish the feeling as you slowly glide into steamy water and relax.'
-		'Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the bath.'
+			act 'Get out and dry off': gt 'dimaHome','bathroom2'
+		end
+		act 'Soak in the bath (0:30)':
+			*clr & cla
+			menu_off = 1
+			minut += 30
+			pcs_sweat = 7 + rand(0,4)
+			pcs_mood += 20
+			pcs_skin += 1
+			if frost > 0:frost = 0
+			pcs_horny += rand(0,2)
+			dynamic $showerdin
+			gs 'stat'
+			'<center><h4><font color="maroon">Upstairs bathroom</font></h4></center>'
+			'<center><img src="images/shared/home/bathroom/wash4.jpg"></center>'
+			'You smile to yourself as you draw a bath in the impressive tub. You relish the feeling as you slowly glide into steamy water and relax.'
+			'Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the bath.'
 
-		act '"Wash" your pussy':
-			cla
-			*clr
-			if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
-			minut += 10
+			act '"Wash" your pussy':
+				cla
+				*clr
+				if obdysh = 1 and rand(0, 5) = 1:gt 'vann', 'v4'
+				minut += 10
 
-			'<center><video src="images/shared/home/bathroom/wash7.mp4"></center>'
-			*nl
-			'You turn on the faucet, lift your legs and scoot your ass over to align your pussy with the jet of warm water. It feels really good and soon a warmth begins to grow in your abdomen.'
+				'<center><video src="images/shared/home/bathroom/wash7.mp4"></center>'
+				*nl
+				'You turn on the faucet, lift your legs and scoot your ass over to align your pussy with the jet of warm water. It feels really good and soon a warmth begins to grow in your abdomen.'
 
-			if pcs_inhib < 30:inhib_exp += rand(1,3)
-			pcs_mood += 15
-			pcs_willpwr += 15
-			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', 10
-			gs 'arousal', 'end'
+				if pcs_inhib < 30:inhib_exp += rand(1,3)
+				pcs_mood += 15
+				pcs_willpwr += 15
+				$orgasm_or = 'yes'
+				gs 'arousal', 'masturbate', 10
+				gs 'arousal', 'end'
 
-			act 'Get out and dry off': gt 'dimaHome','bathroom2'
+				act 'Get out and dry off': gt 'dimaHome','bathroom2'
+			end
 		end
 
 		act 'Get out and dry off': gt 'dimaHome','bathroom2'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $bteeth
@@ -307,32 +310,36 @@ if $ARGS[0] = 'dimkaparents':
 		'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>'
-		act 'Take a shower':
-			*clr & cla
-			minut += 10
-			dynamic $showerdin
-			gs 'stat'
-			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-			'<video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></video>'
-			'You take a quick shower.'
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-			act 'Get out of the shower':
-				'You get out of the shower and dry off.'
-				act 'Get dressed': gt 'dimaHome','Go into master bath'
+		if shampoo > 0:
+			act 'Take a shower':
+				*clr & cla
+				minut += 10
+				dynamic $showerdin
+				gs 'stat'
+				'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+				'<video autoplay loop src="images/characters/pavlovsk/school/boy/igor/mitsa.mp4"></video>'
+				'You take a quick shower.'
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+				act 'Get out of the shower':
+					'You get out of the shower and dry off.'
+					act 'Get dressed': gt 'dimaHome','Go into master bath'
+				end
 			end
-		end
-		act 'Take a bath':
-			*clr & cla
-			minut += 20
-			dynamic $bath
-			gs 'stat'
-			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
-			'<center><img  src="images/shared/home/bathroom/wash4.jpg"></center>'
-			'You take a quick bath.'
-			act 'Get out of the bath':
-				'You get out of the bath and dry off.'
-				act 'Get dressed': gt 'dimaHome','Go into master bath'
+			act 'Take a bath':
+				*clr & cla
+				minut += 20
+				dynamic $bath
+				gs 'stat'
+				'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+				'<center><img  src="images/shared/home/bathroom/wash4.jpg"></center>'
+				'You take a quick bath.'
+				act 'Get out of the bath':
+					'You get out of the bath and dry off.'
+					act 'Get dressed': gt 'dimaHome','Go into master bath'
+				end
 			end
+		else
+			'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 		end
 		gs 'din_van', 'prvt_pee'
 		dynamic $bteeth

+ 41 - 28
locations/din_van.qsrc

@@ -15,8 +15,15 @@ $showerdin = {
 	gs 'cum_cleanup'
 	pcs_hairbsh = 0
 	pcs_makeup = 1
+	if frost > 0:frost = 0
+	if shampoo < 0: shampoo = 0
 	lactation['lactmess'] = 0
 	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
+	if noShampoo = 0:
+		shampoo -= 1
+	else
+		killvar 'noShampoo'
+	end
 	if false_lashes >= 1:
 		if rand(0,4) <= 2:
 			'You''re careful enough that your false lashes make it through relatively unscathed.'
@@ -54,15 +61,11 @@ $shower = {
 	act 'Take a shower (0:15)':
 		menu_off = 1
 		*clr & cla
-		shampoo -= 1
 		minut += 15
-
-		if shampoo < 0: shampoo = 0
-
+		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
-		if frost > 0:frost = 0
-
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
 		'You undress and turn on the water in the shower. When it hits the right temperature you enter the shower and let the warm water rain down on you.'
@@ -74,8 +77,15 @@ $shower = {
 			'You have already gotten used to your feminine body and its softness doesn''t surprise you very much anymore. But you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
 			pcs_horny += rand(0,2)
-			'You carefully soap yourself trying not to miss any spot and then wash off.'
+			''+iif(noShampoo_tmp = 1, 'It''s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'soap yourself trying not to miss any spot and then wash off.'
 		end
+
+		if shampoo = 0 and noShampoo_tmp = 1:
+			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
+		elseif shampoo <= 5:
+			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+		end
+
 		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
 
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the shower.'
@@ -157,25 +167,21 @@ $shower = {
 			if indorf = 0: gs 'vanrPar', 'peek'
 		end
 	end
+	killvar 'noShampoo_tmp'
 }
 
 $bath = {
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
 		*clr & cla
-		shampoo -= 1
+
 		minut += 30
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
-
-		if shampoo < 0:
-			shampoo = 0
-		end
-
+		if $loc = 'vanrPar' or $loc = 'tanvanr': noShampoo = 1
+		noShampoo_tmp = noShampoo
 		dynamic $showerdin
 
-		if frost > 0:frost = 0
-
 		if bath_daystart ! daystart:
 			bath_daystart = daystart
 			pcs_skin += rand(1,2)
@@ -195,9 +201,17 @@ $bath = {
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
 			pcs_horny += rand(0,2)
-			'You lean back and relax for a while. Then you begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
+			'You lean back and relax for a while. '+iif(noShampoo_tmp = 1, 'It’s not your shampoo, so you use a little more than you normally would; with a tinge of guilt you ', 'Using your own shampoo, you carefully ')+'begin to lather your body, gently gliding your soft hands over your smooth curves, and wash yourself thoroughly.'
 		end
 
+		if shampoo = 0 and noShampoo_tmp = 1:
+			'When you get a chance, you should stop by the supermarket and buy some shampoo.'
+		elseif shampoo <= 5:
+			'You are getting low on shampoo, with only <<shampoo>> remaining. When you get a chance, you should stop by the supermarket and buy some more.'
+		end
+
+		if hypnoAddict > 0:'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
+
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & 'Your deodorant gets washed away in the bath.'
 
 		if btwarn > 0:
@@ -239,6 +253,7 @@ $bath = {
 
 		dynamic $brit
 	end
+	killvar 'noShampoo_tmp'
 }
 
 $brit = {
@@ -967,22 +982,20 @@ if $ARGS[0] = 'private':
 		'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
+	if $loc = 'vanrPar':
+		'You can use your parent''s shampoo.'
+		dynamic $shower
+		dynamic $bath
+	elseif $loc = 'tanvanr':
+		'You can use Tanya''s shampoo.'
+		dynamic $shower
+		dynamic $bath
+	elseif shampoo > 0:
+		'You have enough shampoo for <b><<shampoo>></b> uses.'
 		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:

+ 11 - 5
locations/etoexhib.qsrc

@@ -607,7 +607,7 @@ if $ARGS[0] = 'pos18':
 	'<center><b><font color="maroon">Disco</font></b></center>'
 
 	act 'Go outside':gt 'etoexhib', 'pos17'
-	
+
 	if hour < 23:
 		menu_off = 1
 		temp = rand(1, 100)
@@ -697,7 +697,7 @@ if $ARGS[0] = 'pos18':
 		end
 	else
 		'The Club closes, the lights go off, the music fades and everyone begins to leave.'
-	end	
+	end
 end
 
 if $ARGS[0] = 'pos19':
@@ -1210,7 +1210,7 @@ if $ARGS[0] = 'pos28':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_dir.jpg"></center>'
 	if izvad = 0:
 		'"Welcome, <<$pcs_nickname>>! Hope you like working with us. If you have any questions for me, I''m listening."'
-	elseif izvad = 1: 
+	elseif izvad = 1:
 		'"Hello again, <<$pcs_nickname>>."'
 	end
 
@@ -1257,7 +1257,13 @@ if $ARGS[0] = 'pos34':
 		act 'Next':gt 'etoexhib', 'pos33'
 	end
 
-	act 'Take a shower':gt 'ptu_dush', 'pos1'
+	if shampoo > 0
+		act 'Take a shower':gt 'ptu_dush', 'pos1'
+	else
+		*nl
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
 	act 'Go to the hall':gt 'etoexhib', 'pos33'
 end
 
@@ -1699,7 +1705,7 @@ if $ARGS[0] = 'pos54':
 	end
 
 	act 'Leave': gt 'nordtrain', 'outside'
-	
+
 	if age < 18 and fakepassport ! 1 and money > 30000:
 		act 'Buy fake passport (30,000 <b>₽</b>)':
 			*clr & cla

+ 30 - 26
locations/fit.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'dressing room':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/razd.jpg"></center>'
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
-	
+
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
@@ -113,21 +113,25 @@ if $ARGS[0] = 'dressing room':
 		end
 	end
 
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		menu_off = 1
-		minut += 15
-		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		if pcs_inhib < 15:inhib_exp += rand(1,2)
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-		act 'Get out of the shower':gt 'fit', 'dressing room'
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			menu_off = 1
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			if pcs_inhib < 15:inhib_exp += rand(1,2)
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
+			act 'Get out of the shower':gt 'fit', 'dressing room'
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	act 'Use mirror':
@@ -194,17 +198,17 @@ if $ARGS[0] = 'fitgirl':
 
 	act 'Follow her':
 		*clr & cla
-		!! pcs_hairbsh = 0
-		!! pcs_makeup = 1
-		!! dynamic $showerdin
-		!! dont ruin the pcs makeup and hair because otherwise its pretty hard to get to 80 appearance
+		pcs_hairbsh = 0
+		pcs_makeup = 1
+		noShampoo = 1
+		dynamic $showerdin
 		shovertania += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower0.jpg"></center>'
 		'There''s no one in the shower, except this girl. The girl looks around and seeing you smiles again then turns away.'
-		
+
 		act 'Leave the shower':gt 'fit', 'dressing room'
-		
+
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Molest her (<<will_cost>> Willpower)':
@@ -243,11 +247,11 @@ if $ARGS[0] = 'fitgirl':
 						*clr & cla
 						gs 'stat'
 
-						if pcs_apprnc < 120:
+						if pcs_apprnc < 100:
 							'The girl smiles at you, but removes your hand and leaves, blowing you a kiss.'
 
-							act '...':gt 'fit', 'dressing room'
-						elseif pcs_apprnc >= 120:
+							act 'Continue':gt 'fit', 'dressing room'
+						elseif pcs_apprnc >= 100:
 							cla
 							*clr
 							gs 'underwear', 'remove'
@@ -276,7 +280,7 @@ if $ARGS[0] = 'tanyaIntroduction':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower1.jpg"></center>'
 	'Just as the both of you are about to get more intimate a group of middleaged women enters the showers. They haven''t noticed you yet. The girl next to you is clearly afraid of being spotted in the shower with you and takes her first opportunity to quietely escape to the dressing room.'
 	'You follow her only a few seconds later. She has already begun to dress herself.'
-	
+
 	if $pantyworntype = 'none': gs 'underwear', 'wear'
 	gs 'panties', 'dispose'
 	gs 'clothing', 'wear_last_worn'

+ 144 - 133
locations/foto.qsrc

@@ -859,68 +859,73 @@ if $ARGS[0] = 'showers':
 	'A little bit aways are bathroom stalls with a line of sinks and mirrors on the wall opposite as well as several tampon dispensers.'
 
 	act 'Go to the studio floor':gt'foto','studio'
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		minut += 15
-		pcs_horny += 1
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		inhib_exp += 1
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
-		'You go into a stall and turn on the shower. You lather your body and wash.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		if pcs_horny >= 40:
-			act 'Use the shower head on your pussy':
-				cla
-				*clr
-				gs 'exhibitionism', 1
-				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
-				*nl
-				'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers. '
+	
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			minut += 15
+			pcs_horny += 1
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			inhib_exp += 1
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+			'You go into a stall and turn on the shower. You lather your body and wash.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			if pcs_horny >= 40:
+				act 'Use the shower head on your pussy':
+					cla
+					*clr
+					gs 'exhibitionism', 1
+					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video></center>'
+					*nl
+					'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers. '
 
-				if hypnoAddict > 0:
-					minut += 10
-					'You unconsciously avoid spraying water into your vagina.'
-					act 'Dry off':gt 'foto', 'showers'
-				else
-					if pcs_horny >= 70:
-						if exhibitionist_lvl > 0:
-							gs 'exhibitionism', 1
-							pcs_mood += 15
-							pcs_willpwr += 15
-							$orgasm_or = 'yes'
-							$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
-							gs 'arousal','masturbate', 10
-							gs 'arousal', 'end'
-							act 'Dry off':gt 'foto', 'showers'
+					if hypnoAddict > 0:
+						minut += 10
+						'You unconsciously avoid spraying water into your vagina.'
+						act 'Dry off':gt 'foto', 'showers'
+					else
+						if pcs_horny >= 70:
+							if exhibitionist_lvl > 0:
+								gs 'exhibitionism', 1
+								pcs_mood += 15
+								pcs_willpwr += 15
+								$orgasm_or = 'yes'
+								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
+								gs 'arousal','masturbate', 10
+								gs 'arousal', 'end'
+								act 'Dry off':gt 'foto', 'showers'
+							else
+								gs 'exhibitionism', 2
+								pcs_mood += 15
+								pcs_willpwr += 15
+								$orgasm_or = 'yes'
+								$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+								gs 'arousal','masturbate', 10
+								gs 'arousal', 'end'
+								act 'Dry off':gt 'foto', 'showers'
+							end
 						else
-							gs 'exhibitionism', 2
-							pcs_mood += 15
-							pcs_willpwr += 15
-							$orgasm_or = 'yes'
-							$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+							pcs_horny += 5
+							pcs_mood += 10
+							pcs_willpwr += 10
+							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
 							gs 'arousal','masturbate', 10
 							gs 'arousal', 'end'
 							act 'Dry off':gt 'foto', 'showers'
 						end
-					else
-						pcs_horny += 5
-						pcs_mood += 10
-						pcs_willpwr += 10
-						'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
-						gs 'arousal','masturbate', 10
-						gs 'arousal', 'end'
-						act 'Dry off':gt 'foto', 'showers'
 					end
+					cumspclnt = 8
+					gs 'cum_cleanup'
 				end
-				cumspclnt = 8
-				gs 'cum_cleanup'
 			end
-		end
 
-		act 'Get out of the shower':gt 'foto', 'showers'
+			act 'Get out of the shower':gt 'foto', 'showers'
+		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
 	if mesec > 0 and isprok = 0:
@@ -952,94 +957,98 @@ if $ARGS[0] = 'krystalshower':
 	'"Ahh! Yes! Just like that!"'
 	pcs_horny += 10
 	act 'Leave':gt'foto','studio'
-	act 'Take a shower (0:15)':
-		cla
-		*clr
-		minut += 15
-		pcs_horny += 15
-		pcs_hairbsh = 0
-		pcs_makeup = 1
-		gs 'exhibitionism', 1
-		dynamic $showerdin
-		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></video></center>'
-		'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-		if pcs_horny >= 40:
-			act 'Use the shower head on your pussy':
-				cla
-				*clr
-				gs 'exhibitionism', 2
-				'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				*nl
-				'Her boyfriend pushes her against the wall and pulls her leg up to get deep inside her. Krystal''s moans and the sound of cock slamming into her pussy are too much for you and you can''t stop yourself from placing the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
-				'Your voices start to sync together, echoing out of the stalls in perfect time with each other.'
-				gs 'arousal','masturbate', 5
-				act 'Continue':
-					cla & *clr
-					stat['mast'] += 1
-					if exhibitionist_lvl < 2:
-						pcs_mood += 15
-						pcs_willpwr += 15
-						gs 'exhibitionism', 1
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
-						'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-						$orgasm_or = 'yes'
-						$orgasm_txt = 'You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
-						gs 'arousal','masturbate', 5
-						gs 'arousal', 'end'
-						act 'Dry off':
-							cla & *clr
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
-							'You shyly towel off and start to go when you hear Krystal whisper, "Was it good for you too <<$pcs_nickname>>?"'
-							*nl
-							'Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
-							act'Leave':gt 'foto', 'studio'
-						end
-					else
-						pcs_mood += 15
-						pcs_willpwr += 15
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
-						'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
-						$orgasm_or = 'yes'
-						$orgasm_txt = 'You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
-						gs 'arousal','masturbate', 5
-						gs 'arousal', 'end'
-						act 'Dry off':
-							cla & *clr
-							'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
-							'You start to towel off, widely smiling at Krystal who is washing the cum off her body.'
-							'She smiles back at you. "Maybe you''d like to join us next time?"'
-							'"Maybe, we''ll see!" you say with a smirk.'
-							act'Leave':gt 'foto', 'studio'
+	if shampoo > 0:
+		act 'Take a shower (0:15)':
+			cla
+			*clr
+			minut += 15
+			pcs_horny += 15
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			gs 'exhibitionism', 1
+			dynamic $showerdin
+			'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/broshower.mp4"></video></center>'
+			'You step into a stall and turn on the shower, trying your best to ignore what is going on while Krystal starts getting fucked from behind.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+			if pcs_horny >= 40:
+				act 'Use the shower head on your pussy':
+					cla
+					*clr
+					gs 'exhibitionism', 2
+					'<center><video autoplay loop src="images/shared/home/bathroom/wash2.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					*nl
+					'Her boyfriend pushes her against the wall and pulls her leg up to get deep inside her. Krystal''s moans and the sound of cock slamming into her pussy are too much for you and you can''t stop yourself from placing the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers.'
+					'Your voices start to sync together, echoing out of the stalls in perfect time with each other.'
+					gs 'arousal','masturbate', 5
+					act 'Continue':
+						cla & *clr
+						stat['mast'] += 1
+						if exhibitionist_lvl < 2:
+							pcs_mood += 15
+							pcs_willpwr += 15
+							gs 'exhibitionism', 1
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
+							'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'You feel a warm wave spreading over your entire body and orgasm, biting your lip hard to suppress the scream that wants to come out. You can''t believe that you just masturbated in the studio showers to Krystal having shower sex with her boyfriend...'
+							gs 'arousal','masturbate', 5
+							gs 'arousal', 'end'
+							act 'Dry off':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
+								'You shyly towel off and start to go when you hear Krystal whisper, "Was it good for you too <<$pcs_nickname>>?"'
+								*nl
+								'Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
+								act'Leave':gt 'foto', 'studio'
+							end
+						else
+							pcs_mood += 15
+							pcs_willpwr += 15
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showercum.mp4"></video></center>'
+							'Her boyfriend pulls out of her and she jacks him off furiously until he spatters her belly with his cum.'
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'You loudly groan as you shudder in orgasm, relishing the beautiful image of Krystal''s boyfriend''s cum all over her.'
+							gs 'arousal','masturbate', 5
+							gs 'arousal', 'end'
+							act 'Dry off':
+								cla & *clr
+								'<center><video autoplay loop src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_2.mp4"></video></center>'
+								'You start to towel off, widely smiling at Krystal who is washing the cum off her body.'
+								'She smiles back at you. "Maybe you''d like to join us next time?"'
+								'"Maybe, we''ll see!" you say with a smirk.'
+								act'Leave':gt 'foto', 'studio'
+							end
 						end
+						cumspclnt = 8
+						gs 'cum_cleanup'
 					end
-					cumspclnt = 8
-					gs 'cum_cleanup'
 				end
 			end
-		end
 
-		if exhibitionist_lvl > 1:
-			act 'Dry off':
-				cla & *clr
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				'You start to towel off looking a little enviously at Krystal when her boyfriend pushes her against the wall and starts to take her from the front.'
-				*nl
-				'You take one last look with a bit of regret and go back to the main floor of the studio.'
-				pcs_horny += 20
-				act'Leave':gt 'foto', 'studio'
-			end
-		else
-			act 'Dry off':
-				cla & *clr
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
-				'You shyly towel off, still doing your best to ignore the wild and unashamed sex of your co-worker and her boyfriend, who have now switched positions so Krystal''s back is to the wall with her leg up and his big fat cock now pummelling her from the front.'
-				*nl
-				'As you finish drying off you realize how wet between the legs you are. Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
-				pcs_horny = 70
-				act'Leave':gt 'foto', 'studio'
+			if exhibitionist_lvl > 1:
+				act 'Dry off':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					'You start to towel off looking a little enviously at Krystal when her boyfriend pushes her against the wall and starts to take her from the front.'
+					*nl
+					'You take one last look with a bit of regret and go back to the main floor of the studio.'
+					pcs_horny += 20
+					act'Leave':gt 'foto', 'studio'
+				end
+			else
+				act 'Dry off':
+					cla & *clr
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/portraits/krystal_b/showerfuck.mp4"></video></center>'
+					'You shyly towel off, still doing your best to ignore the wild and unashamed sex of your co-worker and her boyfriend, who have now switched positions so Krystal''s back is to the wall with her leg up and his big fat cock now pummelling her from the front.'
+					*nl
+					'As you finish drying off you realize how wet between the legs you are. Blushing hard you put your towel in the bin and go back to the main floor of the studio.'
+					pcs_horny = 70
+					act'Leave':gt 'foto', 'studio'
+				end
 			end
 		end
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	act'Go to your makeup station':gt'foto','makeup'
 end
@@ -2596,6 +2605,7 @@ if $ARGS[0] = 'blackm':
 								act 'No!':
 									cla
 									*clr
+									noShampoo = 1
 									dynamic $showerdin
 									gs 'boyStat', $boy1
 									spafinloc = 3
@@ -2625,6 +2635,7 @@ if $ARGS[0] = 'blackm':
 									act 'Finally':
 										cla
 										*clr
+										noShampoo = 1
 										dynamic $showerdin
 										gs 'boyStat', $boy1
 										gs 'cum_manage'

+ 19 - 14
locations/gdksport.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec:gt ''gdksport'',''dance1''">Dance</a> and <a href="exec:gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
 	'In the locker room is a <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-	
+
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
 	elseif npc_rel['A3'] >= 80 and hour = 17 and ivansportday ! daystart:
@@ -31,10 +31,10 @@ if $ARGS[0] = 'start':
 		'You can see <a href="exec:gt ''FedorMisc'', ''Fedor Workout''">Fedor</a> on his phone next to some punching bags.'
 	end
 
-	*nl	
+	*nl
 	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'
 	if $shoeworntype ! 'trainers': 'You are not wearing training shoes.'
-	
+
 	act 'Go outside':
 		if $clothingworntype = 'nude':
 			msg'<b><font color = red>You need to get dressed before leaving.</font></b>'
@@ -72,8 +72,12 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'sports_outfit'
 
-	act 'Take a shower':gt 'gdksport', 'shower'
-	
+	if shampoo > 0:
+		act 'Take a shower':gt 'gdksport', 'shower'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
+
 	*nl
 
 	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour < 18:
@@ -123,7 +127,7 @@ if $ARGS[0] = 'racing1':
 	'Race training cost 300 <b>₽</b> for 30 lessons.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboBeg = 0:
 		act 'Buy 30 racing lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -143,7 +147,7 @@ if $ARGS[0] = 'dance1':
 	'Dance lessons cost 300 <b>₽</b> for 30 lessons.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboDance = 0:
 		act 'Buy 30 dance lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -153,7 +157,7 @@ if $ARGS[0] = 'dance1':
 			'You paid for 30 dance lessons.'
 			act 'Leave':gt 'gdksport', 'start'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'vball1':
@@ -163,7 +167,7 @@ if $ARGS[0] = 'vball1':
 	'Volleyball lessons cost 300 <b>₽</b> for 30 visits.'
 
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if money >= 300 and gsAboVolley = 0:
 		act 'Buy 30 volleyball lessons (300 <b>₽</b>)':
 			*clr & cla
@@ -173,7 +177,7 @@ if $ARGS[0] = 'vball1':
 			'You paid for 30 volleyball lessons.'
 			act 'Leave':gt 'gdksport', 'start'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'dance2':
@@ -181,9 +185,9 @@ if $ARGS[0] = 'dance2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
-	
+
 	act 'Leave':gt 'gdksport', 'start'
-	
+
 	if pcs_danc < 50:
 		gsAboDance -= 1
 		timemult = 8
@@ -413,7 +417,7 @@ if $ARGS[0] = 'starlets':
 	*clr & cla
 
 	startletsday = daystart
-	
+
 	timemult = 8
 	loopcount = 1
 	:starletstimeloop
@@ -474,6 +478,7 @@ if $ARGS[0] = 'starlets':
 				loopcount = 0
 				timemult = 0
 				money += albpayrand * 1000
+				noShampoo = 1
 				dynamic $showerdin
 				profiDanceTime += 1
 				inhib_exp += rand(3,5)
@@ -1112,7 +1117,7 @@ if $ARGS[0] = 'Ivan_bored':
 	'You look at Ivan for a long moment and bite your lower lip and then whisper just loud enough he can barely hear you. "I''m bored." He looks at you a moment then smiles, he looks around, then takes you by the hand and leads you away from the others, into one of the lesser used area''s of the school. He stops at one of the boys restrooms, going inside and leaving you outside. A few moments later two younger boys are ushered out by Ivan and sent packing. He watches them go, once they round the corner he pulls you into the bathroom.'
 
 	act 'Leave': gt 'gschool_lessons', 'short_break'
-	
+
 	act 'Go into the bathroom with Ivan':
 		*clr & cla
 		pcs_horny += 20

+ 11 - 7
locations/gschool_boys_bathroom.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'bathroom2':
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 	if school_bunk = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone2.jpg"></center>'
-		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'		
+		'For the rest of the period, you play on your phone and find it very relaxing. By the time the next class bell rings, you are in a far better mood.'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke2.jpg"></center>'
 		'For the rest of the period, you play on your phone while having another cigarette or two. You find it very relaxing and by the time the next class bell rings, you are in a far better mood.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'boy2':
 				if gruptipe = 4:'As he finds and rubs your clit '+iif($pantyworntype ! 'nude', 'through your panties','')+', he whispers: "If you''re an obedient little bitch, I will put in a good word with the rest. Who knows, maybe I could get you fully accepted."'
 				gs 'arousal', 'foreplay', 5
 				gs 'stat'
-				
+
 				gs 'willpower', 'sex', 'self', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Slap him (<<will_cost>> willpower)':
@@ -308,6 +308,7 @@ if $ARGS[0] = 'boy2_sub':
 				'When he''s finished cleaning up and his uniform is back in place, he heads for the door but pauses on his way out. "I look forward to next time, but maybe do some of those exercises to tighten up that pussy of yours, or maybe I will just go straight for you ass next time," he shrugs as if it doesn''t really matter to him and then exits, leaving you standing there, still struggling to wash your ass.'
 				*nl
 				'Luckily for you, no one else enters the bathroom while you clean yourself off and get dressed. You leave the bathroom just before the bell rings, hoping no one spots you. You can''t help but wonder if Radomir was serious about those exercises...'
+				noShampoo = 1
 				dynamic $showerdin
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -328,7 +329,7 @@ if $ARGS[0] = 'boy3':
 	if hotcat >= 6:
 		'Lazar sets the folder aside. "I was studying the playbook for this week''s game, but I''d be up for some fun and stress relief," he says with a lustful grin. You''re wondering what he means by ''stress relief,'' when he suddenly moves towards you. He quickly starts kissing you and grabbing at your breasts and ass.'
 		gs 'willpower', 'sex', 'resist'
-		if will_cost <= pcs_willpwr: 
+		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
@@ -413,6 +414,7 @@ if $ARGS[0] = 'boy3_kiss':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'masturbate', 5
 				gs 'arousal', 'end'
+				noShampoo = 1
 				dynamic $showerdin
 				gs 'stat'
 				'His dick barely exits your ass before the first jet of hot sperm lands on your inner thigh, another lands on your pubic area, a third hitting your wet cunt and fingers. He shudders a bit and finally stops spurting cum as your own shivers subside. He looks at you and smiles, giving you a quick kiss while he helps you down from the sink. "That was good," he comments and you are inclined to agree.'
@@ -513,7 +515,7 @@ if $ARGS[0] = 'boy4':
 					end
 				end
 			else
-				act 'Keep sucking (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'	
+				act 'Keep sucking (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Agree to fuck':
 				Marcus_sextype = 1
@@ -711,6 +713,7 @@ if $ARGS[0] = 'boy5':
 						gs 'cum_call', 'mouth', $boy
 						gs 'boyStat', 'A3'
 						gs 'cum_call', 'anus', $boy
+						noShampoo = 1
 						dynamic $showerdin
 						gs 'stat'
 						'Shortly after this moment, Fedor tenses up and holds your head still, his dick buried deep in your mouth. He shoots his cum deep inside, most of it hitting the back of your throat and getting swallowed instantly, and pumps his manhood even deeper into your mouth a couple more times before pulling out and standing up to watching Ivan, still pounding your ass. Not that he has much time to enjoy it: Maybe a minute later, Ivan groans loudly and buries his dick deep in your ass and you feel a warmth inside you as he starts cumming. He keeps going for a few more strokes but then pulls out of your ass, just as he stops shooting spurts of sperm in your ass. As his dick leaves your ass, which gapes a bit after his enthusiastic fuck, you feel some of the cum running out. Ivan stands up and smiles, "Fuck, that was great. You''re the best, <<$pcs_nickname>>."'
@@ -962,6 +965,7 @@ if $ARGS[0] = 'boy6_sub':
 						act 'Clean up':
 							*clr & cla
 							*nl
+							noShampoo = 1
 							dynamic $showerdin
 							gs 'stat'
 							'You stand up, wobbly, your tears doing nothing to wash off the semen. You go to the sink and clean yourself up as best you can, which is a lot more than you expected but not enough to <i>feel</i> clean. When you think you''ve done everything you can do here to remove the sperm and have cried yourself out enough to pull yourself back together, you gather your clothes and get dressed. The bell rings, just as you button up your shirt and remember the ripped-off button. You hurriedly search, find and pocket it, check yourself in the mirror to make sure there''s no obvious bruises or cum stains and that it isn''t too obvious you''ve been crying. Then, with one last, deep breath, you head to class.'
@@ -1501,7 +1505,7 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
 		'You get down on your knees in front of him and hike up your skirt just a little bit to reveal more of your legs. When you are sure you have his eyes on you, you look up at him and suggestively lick your lips. "You seem tense, sir. How about I help you relax a little bit and you just pretend you didn''t see me here?"'
-		
+
 		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
@@ -1550,7 +1554,7 @@ if $ARGS[0] = 'caughtb2':
 		'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
 		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Ivanov over your shoulder, "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
-		
+
 		gs 'gschool_events', 'sweet', 'sex'
 		if rand(1,100) < Sweet_talk:
 			*clr & cla
@@ -1704,7 +1708,7 @@ if $ARGS[0] = 'boy7':
 				end
 			else
 				act 'Make him take it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 		end
 	end
 end

+ 5 - 1
locations/gschool_grounds.qsrc

@@ -687,7 +687,11 @@ if $ARGS[0] = 'change_room':
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $shower
+	if shampoo > 0:
+		dynamic $shower
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
 	dynamic $tampon
 	gs 'din_van', 'pblc_pee'
 end

+ 7 - 1
locations/gschool_lessons2.qsrc

@@ -1382,7 +1382,13 @@ if $ARGS[0] = 'postphys2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
-	act 'Have a shower': gt 'gschool_lessons2', 'shower'
+	
+
+	if shampoo > 0:
+		act 'Have a shower':gt 'gschool_lessons2', 'shower'
+	else
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	end
 	act 'Get dressed': gt 'gschool_lessons2', 'dress'
 end
 

+ 30 - 28
locations/hotel_resep.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = '':
 	else
 		'<<$receptionName>> is manning the reception desk yet again. You wonder if she ever takes a break at all.'
 	end
-	
+
 	act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 
 	if GermanQW < 1:
@@ -28,7 +28,7 @@ if $ARGS[0] = '':
 			act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 		end
 	end
-	
+
 	if hotelcollect > 0:
 		act 'Collect your money':
 			cla
@@ -36,7 +36,7 @@ if $ARGS[0] = '':
 			money += maidtime * 250
 			'She quickly checks the computer and then gives you <<maidtime*250>> <b>₽</b> for all the shifts you worked in the hotel.'
 			maidtime=0
-			
+
 			if maidHotelCount >= rand(8,10) and nichHotelReferral = 0:
 				'"You are doing a good job as our maid. Did you ever think about working as a maid full-time? I know of a person who''s living in the city and is looking for a live-in maid. The job also pays well."'
 				'She hesitates for a second.'
@@ -58,7 +58,7 @@ if $ARGS[0] = '':
 				PavlinQW = 1
 			end
 			gs'stat'
-			
+
 			if pavlevent = 1:
 				'You are too scared of <<$npc_nickname[''A217'']>> at the moment to meet him in a private place.'
 				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
@@ -74,7 +74,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	
+
 	if nichHotelReferral = 1:
 		act 'Ask about the live-in maid job':
 			*clr & cla
@@ -83,14 +83,14 @@ if $ARGS[0] = '':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'You approach the reception desk, and ask the girl: "About the job you told me about ... I''d like to get your referral."'
 			'"Great. Do you have my fee of 5.000 <b>₽</b> with you?"'
-			
+
 			act 'No':
 				cla & *nl
 				'"Actually I don''t."'
 				'"Too bad. I''m afraid I can''t help you unless you pay me. Just come back as soon as you have the money."'
 				act 'Step away from the reception desk':gt'HotelHole','skip_resepevent'
 			end
-			
+
 			if money >= 5000:
 				act 'Yes (give it to her)':
 					cla & *nl
@@ -106,7 +106,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	
+
 	act'Rent a room':
 		menu_off = 1
 		*clr & cla
@@ -293,7 +293,7 @@ if $ARGS[0] = 'pavlbar':
 		act 'Continue': gt 'hotel_resep', 'pavlbarcont'
 	end
 end
-	
+
 if $ARGS[0] = 'pavlbarcont':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
@@ -330,7 +330,7 @@ if $ARGS[0] = 'pavlbarcont':
 		gs 'stat'
 		'"This was not what we agreed to." You say. "I need more..."'
 		'"Sure, you can have more, but you need to do some extra work for that."'
-		'<<$npc_nickname[''A217'']>> takes your hand and moves it towards his crotch.'				
+		'<<$npc_nickname[''A217'']>> takes your hand and moves it towards his crotch.'
 
 		act 'Be content with what you have':
 			*clr & cla
@@ -340,10 +340,10 @@ if $ARGS[0] = 'pavlbarcont':
 			'He leans back in his chair and checks out your ass while you are leaving.'
 			act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		end
-		
+
 		act 'Do the extra work':
 			*clr & cla
-			pav_prostitute += 1		
+			pav_prostitute += 1
 			if npc_rel['A217'] >= 10:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin_bj.jpg"></center>'
 				'"Fine" you say. You open his fly and take out his half-erect penis.'
@@ -367,7 +367,7 @@ if $ARGS[0] = 'pavlbarcont':
 			act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		end
 	end
-	
+
 	if npc_rel['A217'] <= 5:
 		'You are sure the money he received from the customer was more than double this amount but you don''t feel like arguing.'
 		'You thank him and go back to the hotel lobby'
@@ -377,7 +377,7 @@ if $ARGS[0] = 'pavlbarcont':
 		act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		exit
 	end
-	
+
 	if npc_rel['A217'] = 6 and pavlevent = 0:
 		'You are sure the money he received from the customer was more than double this amount'
 		'You bring up the issue: "Actually <<$npc_nickname[''A217'']>>, I believe I should get more money, I am doing all the work here and I know these guys pay you much more than this."'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'pavlbarcont':
 			'"Sure <<$pcs_firstname>>, no problem."'
 			act'Go back to the hotel lobby':gt'HotelHole','skip_resepevent'
 		end
-		
+
 		act 'Follow him outside':
 			minut += 15
 			*clr & cla
@@ -406,7 +406,7 @@ if $ARGS[0] = 'pavlbarcont':
 			'"WHO DO YOU THINK YOU ARE, BITCH? You work for ME, I decide how much money you get. YOU UNDERSTAND ME?"'
 			'He is screaming and after every sentence he hits you in the face again.'
 			!only check for strength and dom at the moment, might change later
-			
+
 			if pcs_dom > 50 and pcs_stren > 60:
 				PavlinQW = 3
 				'You try to defend yourself and start hitting back. He did not expect this and is startled for a moment.'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'pavlbarcont':
 				'You quickly crawl on your feet and run away.'
 				PavlinQW = 4
 			end
-			
+
 			gs 'pain', 8,'head','hit'
 			pavlevent = 1
 			pavldaystart = daystart
@@ -457,7 +457,7 @@ if $ARGS[0] = 'pavgenpros':
 	custleft = 0
 	mmfextrapay = 0
 	mmfcond = 0
-	
+
 	if pavproscount < 20:
 		custrand = 9
 	else
@@ -525,7 +525,7 @@ if $ARGS[0] = 'pavgenpros':
 		else
 			'"I just informed the customer, he''ll be here shortly."'
 			act 'Perform your duty': gt 'hotel_resep', 'clientselect'
-		end	
+		end
 	end
 end
 
@@ -566,7 +566,7 @@ if $ARGS[0] = 'pavgenprosmf':
 	!! Higher values mean the customer will want sex without a condom.
 	!! If customerrand = 9 Sveta is in for something unpleasant, depending on choices.
 	customerrand = rand(0, 9)
-	
+
 	if customerrand < 3:
 		if prezik > 0:
 			prezik -= 1
@@ -825,7 +825,7 @@ if $ARGS[0] = 'vaginalmf':
 					money += 500
 					gs 'stat'
 					act 'Continue': gt 'hotel_resep', 'analmf'
-				end			
+				end
 			end
 		end
 	else
@@ -859,12 +859,12 @@ if $ARGS[0] = 'pavgenprosmmf':
 	guy += 1
 	pav_prostitute += rand(2,4)
 	pavprosmmf = 1
-	
+
 	gs 'npcgeneratec', 0, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated
 	gs 'npcgeneratec', 0, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated,'1'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/mmf01.jpg"></center>'
 	'The customers introduce themselves as <<$boydesc[0]>> and <<$boydesc[1]>>. "I''m <<$pcs_nickname>>. You tell them.'
 	'"We''ve just booked you for the next hour. So let''s have some fun. <<$npc_nickname[''A217'']>> said we should agree on a price to fuck both of your holes with you. Oh, and I hope you won''t insist on condoms."'
@@ -878,7 +878,7 @@ if $ARGS[0] = 'pavgenprosmmf':
 				'You catch the look that passes between them. After a moment you see <<$boydesc[1]>> nod while <<$boydesc[0]>> takes out his wallet and throws the money on the bed.'
 				act 'Continue': gt 'hotel_resep', 'sexmmf'
 			end
-		else		
+		else
 			act 'Ask for 1000 <b>₽</b>':
 				cla
 				mmfextrapay = 1
@@ -906,7 +906,7 @@ if $ARGS[0] = 'pavgenprosmmf':
 	end
 end
 
-if $ARGS[0] = 'sexmmf':	
+if $ARGS[0] = 'sexmmf':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/mmf01.jpg"></center>'
 	'You can feel yourself getting wet at the idea of taking both of their cocks at the same time. "So what do you guys have there for me?" You say as you start undressing and step in between them.'
 	'They waste no time getting their cocks out. You are pleased to see they are already hard for you. "Hmm, they look tasty." You tell them as you pull your tits out and squat between them.'
@@ -1053,10 +1053,10 @@ if $ARGS[0] = 'pavgenprosff':
 	girl += 1
 	pav_prostitute += rand(2,4)
 	pavprosff = 1
-	
+
 	gs 'npcgeneratec', 1, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/ff01.jpg"></center>'
 	'The customer introduces herself as <<$boydesc>>. "I''m <<$pcs_nickname>>." You tell her.'
 	'"I''ve just booked you for the next hour. So let''s have some fun.'
@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'pavgenprosff':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/prostitution/ff06.jpg"></center>'
 						'It doesn''t take long before <<$boydesc>> grabs you by the hair and presses her pussy down on your mouth while she uses her other hand to massage her breasts.'
 						'You find your way to her clit and start sucking on it hard. Within seconds she starts bucking on top of you violently. By the time she rolls off, your face is smeared with her juices.'
-						
+
 						gs 'arousal', 'cuni_give', 5, 'prostitution'
 						gs 'arousal', 'end'
 						if succubusflag = 1:
@@ -1199,6 +1199,7 @@ if $ARGS[0] = 'ffshower':
 					'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 					'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
 					orgasm += 1
+					noShampoo = 1
 					dynamic $showerdin
 					gs 'arousal', 'kiss', 5, 'prostitution'
 					gs 'stat'
@@ -1213,6 +1214,7 @@ if $ARGS[0] = 'ffshower':
 				'"That was pretty incredible. I''ll make sure to ask for you when I''m in town again." She says as she puts her clothes back on.'
 				'"I''d love that. My... My clients usually aren''t as gentle with me as you were. I-I liked it. A lot." You say a bit abashed.'
 				'"See you next time then sweetie" She says and walks out of the hotelroom. "And remember to keep this our little secret."'
+				noShampoo = 1
 				dynamic $showerdin
 				gs 'arousal', 'kiss', 5, 'prostitution'
 				gs 'stat'

+ 41 - 40
locations/husbSex.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = 'dolg':
 
 	gs 'arousal', 'bj', 10, 'sub', 'group'
 	gs 'stat'
-									
+
 	act 'Further':
 		cla
 		*clr
@@ -118,9 +118,9 @@ if $ARGS[0] = 'dolg':
 		gs 'arousal', 'anal', 20, 'group'
 		minut -= 20
 		gs 'stat'
-		
+
 		act 'Finish':gt'husbSex','dolgend'
-		
+
 		if harakHusb = 0 and izvratH = 0:
 			'He is huddled in a corner quietly weeping, not looking in your direction.'
 		elseif harakHusb = 0 and izvratH = 1:
@@ -135,15 +135,16 @@ if $ARGS[0] = 'dolg':
 			cla
 			picrand = 18
 			'He is standing on the sidelines, looking at you with his dick in his hand. Soon he can no longer resist and comes over to the bed, saying "Well, you both can do what you want, but she is my bitch and I''ll fuck her too." The bandits don''t object.'
-		
+
 			act 'Further':gt'paysex','var'
-		end		
+		end
 	end
 end
 
 if $ARGS[0] = 'dolgend':
 	cla
 	*clr
+	noShampoo = 1
 	dynamic $showerdin
 	gs'stat'
 
@@ -211,10 +212,10 @@ if $ARGS[0] = 'minet':
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj24.jpg"></center>'
 	'Your husband''s <<husDick>> centimeter member enters you mouth.'
-	
+
 	gs 'arousal', 'bj', 10, 'sub'
 	gs 'stat'
-	
+
 	if stat['bj'] = 1:'You think "This is exciting. I am sitting in front of a man, with his dick in my mouth."'
 
 	gs'oral','start'
@@ -281,7 +282,7 @@ if $ARGS[0] = 'hand':
 	gs 'arousal', 'hj', 20, 'dom'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Go to the bathroom':
 		cla
 		gt'vanr'
@@ -299,7 +300,7 @@ if $ARGS[0] = 'kuni':
 
 	gs 'arousal', 'cuni', 20, 'dom'
 	gs 'stat'
-	
+
 	if pcs_horny >= 90:
 		pcs_mood += 15
 		pcs_willpwr = pcs_willpwr + 15
@@ -313,7 +314,7 @@ if $ARGS[0] = 'kuni':
 
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Further':
 		cla
 		gt'husbsex','variant'
@@ -331,7 +332,7 @@ if $ARGS[0] = 'strapon':
 	gs 'arousal', 'anal_strap_give', 20, 'dom'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Go to the bathroom':
 		cla
 		gt'vanr'
@@ -357,7 +358,7 @@ if $ARGS[0] = 'anal':
 		else
 			'<<$husName>> pulls out the anal plug and oozes flush out of your ass. Soon you feel his hard cock enter your hole.'
 		end
-		
+
 		gs 'arousal', 'anal_dildo', 3, 'sub'
 		gs 'stat'
 
@@ -371,7 +372,7 @@ if $ARGS[0] = 'anal':
 
 		gs 'arousal', 'anal', 20, 'sub'
 		gs 'stat'
-	
+
 		if pcs_horny < 1:
 			pcs_horny = 1
 		elseif pcs_horny >= 100:
@@ -383,7 +384,7 @@ if $ARGS[0] = 'anal':
 
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Going to the bathroom':
 			cla
 			gt'vanr'
@@ -399,28 +400,28 @@ if $ARGS[0] = 'anal':
 	else
 		lubri = lubri - 1
 		lubonus = 10
-		'You get the lubricant out of a box and hand it to your husband. He puts a little on his palm and rubs your anus with it.'		
+		'You get the lubricant out of a box and hand it to your husband. He puts a little on his palm and rubs your anus with it.'
 	end
-	
+
 	gs 'arousal', 'anal_finger', 3, 'sub'
 	gs 'stat'
 
 	'<<$husName>> puts you on you stomach and parts your buttocks, massaging your anus with his fingers, first one, then two.'
-	
+
 	if pcs_ass < 10:
 		'When he enters your ass with three fingers you involuntarily groan in pain.'
 	else
 		'He continues using three fingers and begins to stretch your anus.'
 	end
-	
+
 	gs 'arousal', 'anal_finger', 3, 'sub'
 	gs 'stat'
-		
+
 	'<<$husName>> Pulls his fingers out of your ass, and you feel his hard cock slide into your hole.'
 
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
-		
+
 	if pcs_ass + lubonus < husDick:
 		'You scream and bit your lip from the sharp pain when his member slides into you ass.'
 	else
@@ -431,7 +432,7 @@ if $ARGS[0] = 'anal':
 
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
-	
+
 	if pcs_ass + lubonus + 2 < husDick:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and sink your teeth into the pillow when his <<husDick>> inch cock begins to fuck your ass at full power.'
@@ -443,7 +444,7 @@ if $ARGS[0] = 'anal':
 
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'stat'
-	
+
 	if klismaday ! daystart:
 		husband -= 1
 		'<<$husName>> takes his member out of your ass and seeing shit on his dick tells you, "Damn. <<$pcs_nickname>> clean your ass before sex."'
@@ -456,7 +457,7 @@ if $ARGS[0] = 'anal':
 
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Go to the bathroom':
 		cla
 		lubonus = 0
@@ -478,12 +479,12 @@ if $ARGS[0] = 'miss':
 	gs 'arousal', 'vaginal_finger', 5
 	gs 'arousal', 'vaginal', 15
 	gs 'stat'
-	
+
 	gs'orgazm','start'
 
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Go to the bathroom':
 		cla
 		gt'vanr'
@@ -502,12 +503,12 @@ if $ARGS[0] = 'dog':
 
 	gs 'arousal', 'vaginal', 30, 'sub'
 	gs 'stat'
-	
+
 	gs'orgazm','start'
 
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Go to the bathroom':
 		cla
 		gt'vanr'
@@ -523,13 +524,13 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
-		
+
 		if hour > 22 or hour < 7:
 			'<<$husName>> looks at you, obviously a little dumbfounded.'
 		else
 			'Just as you start getting into it, <<$husName>> walks in.'
 		end
-		
+
 		if harakHusb = 0:
 			'"What are you doing honey?" he asks.'
 			'"Sorry, honey, but I really need to release steam, and you were busy." You answer, while continuing to masturbate.'
@@ -545,7 +546,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act 'Finish':gt'bed','start'
 			else
 				'"Well, I don''t know." He says hesitantly.'
@@ -561,7 +562,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 					gs 'arousal', 'masturbate', 10
 					gs 'stat'
-	
+
 					act 'Of course':
 						cla
 						*clr
@@ -573,7 +574,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 						$orgasm_or = 'yes'
 						gs 'arousal', 'end'
 						gs 'stat'
-						
+
 						act 'Finish':gt'bed','start'
 					end
 				end
@@ -586,7 +587,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 			gs 'arousal', 'masturbate', 10
 			gs 'stat'
-	
+
 			if izvratH = 0:
 				husband += 1
 				husbizvradd += 1
@@ -596,7 +597,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 				gs 'arousal', 'end'
 				gs 'stat'
-				
+
 				act 'Finish':gt'bed','start'
 			else
 				husband += 1
@@ -614,7 +615,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 					gs 'arousal', 'masturbate', 10
 					gs 'stat'
-			
+
 					act 'Use your mouth':
 						cla
 						*clr
@@ -625,7 +626,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 						gs 'arousal', 'anal_dildo', 10, 'sub'
 						minut -= 10
 						gs 'stat'
-			
+
 						act 'Let him fuck your ass':
 							picrand = 89
 							gt'sex','anal'
@@ -639,7 +640,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 			gs 'arousal', 'masturbate', 10
 			gs 'stat'
-					
+
 			if izvratH = 0:
 				husband += 1
 				husbizvradd += 1
@@ -650,7 +651,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 				gs 'arousal', 'vaginal_dildo', 10, 'sub'
 				minut -= 10
 				gs 'stat'
-						
+
 				act 'Open your legs':
 					picrand = 89
 					gt'sex','vag'
@@ -662,7 +663,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 
 				gs 'arousal', 'anal_dildo', 10, 'sub'
 				gs 'stat'
-						
+
 				act 'Use your mouth':
 					cla
 					*clr
@@ -673,7 +674,7 @@ if $ARGS[0] = 'husb_mastr_vtor':
 					gs 'arousal', 'anal_dildo', 10, 'sub'
 					minut -= 10
 					gs 'stat'
-						
+
 					act 'Let him fuck your ass':
 						picrand = 89
 						gt'sex','anal'

+ 3 - 0
locations/katjaEv.qsrc

@@ -214,6 +214,7 @@ if $ARGS[0] = '6':
 
 				act 'Wash alone':
 					cls
+					noShampoo = 1
 					dynamic $showerdin
 					minut += 15
 					pcs_horny += 1
@@ -245,6 +246,7 @@ if $ARGS[0] = '6':
 				if mesec <= 0:
 					act 'Bathe together':
 						cls
+						noShampoo = 1
 						dynamic $showerdin
 						minut += 15
 						pcs_horny += 1
@@ -328,6 +330,7 @@ if $ARGS[0] = '6':
 					end
 				end
 			elseif KatjaHorny < 50:
+				noShampoo = 1
 				dynamic $showerdin
 				minut += 15
 				pcs_horny += 1

+ 3 - 3
locations/kotovdom.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'kotov_kom':
 		'"Thanks for fun <<$pcs_nickname>>. " he says looking up at you from the bed. Seeing that you are ready to go, he tells: "Take care, You are always welcome here."'
 		act 'Say goodbye and leave his apartment':gt 'pavResidential'
 	end
-	if pcs_sweat >= 20: 
+	if pcs_sweat >= 20:
 		'Vitek looks up at you from his bed and says: "You''re all sweaty, kitten. You should go take a shower before going home."'
 		act 'Nod and look for the bathroom':gt 'kotovdom', 'kotovkom'
 	end
@@ -62,7 +62,7 @@ if $ARGS[0] = 'vann':
 		pcs_horny += 1
 		pcs_hairbsh = 0
 		pcs_makeup = 1
-
+		noShampoo = 1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 
@@ -102,7 +102,7 @@ if $ARGS[0] = 'kotovkom':
 	gs 'stat'
 	'<center><b><font color = maroon>Vitek''s bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
-	*nl 
+	*nl
 	'<a href="exec:gt ''kotovdom'', ''kotov_kom''">Vitek</a> is lying on his bed, relaxing and watching TV.'
 	act 'Go to the hallway':gt 'kotovdom','kor'
 	if $clothingworntype = 'nude': act 'Dress yourself': gs 'shortgs','dress' & gt 'kotovdom','kotovkom'

File diff suppressed because it is too large
+ 164 - 164
locations/lesbisubhouse.qsrc


+ 10 - 6
locations/mey_vika_events.qsrc

@@ -521,15 +521,15 @@ if $ARGS[0] = 'park_meet':
 				if (month >= 5 and month <= 10) and (hour <= 20 and hour >= 8):
 					'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
 
-					if mesec = 0: 
-						act 'Go with them to the beach': 
+					if mesec = 0:
+						act 'Go with them to the beach':
 							gt 'mey_vika_events', 'beach_event0'
 						end
 						act 'Decline':
 							cla
 							*nl
 							'You''re in in a hurry, so you decide to thank Vicky for the invite but that you have something elsewhere that you need to attend.'
-							
+
 							act 'Leave': gt 'gskver', 'start'
 						end
 					else
@@ -537,15 +537,15 @@ if $ARGS[0] = 'park_meet':
 							cla
 							*nl
 							'You currently have your period, and feel up to visiting the beach today, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
-							
+
 							act 'Leave': gt 'gskver', 'start'
 						end
 					end
 				elseif hour >= 14 and hour < 21:
 					'Vicky invites you to the new trendy cafe "Del Parco".'
 
-					if money > 300: 
-						act 'Visit the cafe': 
+					if money > 300:
+						act 'Visit the cafe':
 							gt 'mey_vika_events', 'cafe_repeat_qw'
 						end
 						act 'Decline':
@@ -751,6 +751,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
+				noShampoo = 1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach3.jpg"></center>'
@@ -763,6 +764,7 @@ if $ARGS[0] = 'beach_event0':
 				*clr & cla
 				minut += 10
 				pcs_mood += 10
+				noShampoo = 1
 				dynamic $showerdin
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach4.jpg"></center>'
@@ -1297,6 +1299,7 @@ if $ARGS[0] = 'gym0':
 												cla
 												*clr
 												minut += 15
+												noShampoo = 1
 												dynamic $showerdin
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/after_bath0.jpg"></center>'
 												'It takes you about fifteen minutes to take a shower.'
@@ -1489,6 +1492,7 @@ if $ARGS[0] = 'bath_common':
 									act 'Further':
 										*clr & cla
 										pcs_mood += 20
+										noShampoo = 1
 										dynamic $showerdin
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/bath_qw10.jpg"></center>'

+ 80 - 79
locations/natbelapt.qsrc

@@ -17,8 +17,8 @@
 !---------------------------------------------
 
 !!{ Natasha Quest Line
-NatashaQW = 0: 
-NatashaQW = 1: You can study with Natasha after school. 
+NatashaQW = 0:
+NatashaQW = 1: You can study with Natasha after school.
 NatashaQW = 2: Natasha borrowed money for the first time.
 NatashaQW = 3: You made Natasha do your homework to repay you.
 NatashaQW = 4: You made Natasha carry your books in the morning. - Requires the event to be called from Sveta''s home
@@ -68,7 +68,7 @@ if $ARGS[0] = 'home':
 		natbabycount += 1
 		natpregday = 0
 	end
-	
+
 	! Natasha location
 	NatashaShower = 0
 	NatashaLoc = rand(0,7)
@@ -90,24 +90,24 @@ if $ARGS[0] = 'home':
 	elseif NatashaLoc = 7:
 		$NatashaLocMsg = 'Natasha is doing some laundry. You know the way.'
 	end
-	
+
 	!!Check if Natasha''s mother isn''t at work
 	gs 'natbelEv', 'natmomhome'
-	
+
 	! Random to check who opens the door: 0 = Natasha, 1 = Mother
 	if NatashaMotherHome = 1:
 		DoorOpenBy = rand(0, 1)
 	else
 		DoorOpenBy = 0
 	end
-	
+
 	! If Natasha is in the shower her mom will open the door
 	if (NatashaLoc = 6 or NatashaLoc = 7) and NatashaMotherHome = 1: DoorOpenBy = 1
-	
+
 	! Variable to store the name of Natasha''s mother. If she gets added as full NPCs it''ll be easier to adjust the code.
 	$NatashaMotherName= 'Isabella'
 	$NatashaMotherNickname = 'Bella'
-	
+
 	! Natasha''s mother''s state. If it''s 0 you get a random state.
 	if NatashaMotherState = 0:
 		NatashaMotherState = rand(1,6)
@@ -124,7 +124,7 @@ if $ARGS[0] = 'home':
 	elseif NatashaMotherState = 6:
 		$NatashaMotherStateMsg = 'angry'
 	end
-	
+
 	*clr & cla
 	'<center><img src="images/locations/pavlovsk/resident/apartment/aptdoor.jpg"></center>'
 	'You walk up to the front door and knock.'
@@ -140,13 +140,13 @@ if $ARGS[0] = 'home':
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
 		elseif natpregday > 0 and (daystart-natpregday) >= 90 and (daystart-natpregday) < 200:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(2).jpg" width="356"></center>'
-		elseif natpregday > 0 and (daystart-natpregday) >= 200: 
+		elseif natpregday > 0 and (daystart-natpregday) >= 200:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/16(3).jpg" width="356"></center>'
 		end
 		'You stand outside the Belova household, knocking on the door. After a few moments, Natasha opens the door.'
 		if natpregday > 0 and (daystart-natpregday) >= 90 and (daystart-natpregday) < 200:
 			'Looking at Natasha, her pregnant belly is starting to show. You have a strong suspicion that she carries your niece or nephew.'
-		elseif natpregday > 0 and (daystart-natpregday) >= 200: 
+		elseif natpregday > 0 and (daystart-natpregday) >= 200:
 			'Looking at Natasha, it is clear that she is pregnant. You have a strong suspicion that she carries your niece or nephew.'
 		end
 		if NatashaQW > 5:
@@ -324,12 +324,13 @@ if $ARGS[0] = 'bathroom':
 		*clr & cla
 		menu_off = 1
 		minut += 10
+		noShampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		! Randomized shower event
 		temp = rand(0,4)
 
-		if NatashaMotherHome = 1 and temp = 0: 
+		if NatashaMotherHome = 1 and temp = 0:
 			gt 'natbelapt', 'showerevent1'
 		else
 			'<center><h4><font color="maroon">Bathroom</font></h4></center>'
@@ -390,9 +391,9 @@ if $ARGS[0] = 'natroom':
 	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Natasha''s Room</font></h4></center>'
-	
+
 	act 'Leave Natasha''s room': gt 'natbelapt', 'hallway'
-	
+
 	if hour <= 6 or hour >= 23:
 		NatashaLoc = 2
 		*clr & cla
@@ -443,20 +444,20 @@ if $ARGS[0] = 'natroom':
 		'Natasha''s room looks very tidy. What it lacks in decorations is made up by how well she''s using her available space. On the right side, there''s a narrow bed in the corner with a bed stand next to it and a big closet for all of her clothes.'
 		'On the left side, right behind the door is a small sofa, her desk and computer are in the back corner. Everything is cleaned and neatly organized.'
 	end
-		
+
 	if NatashaLoc = 2 and hour > 6 and hour < 23:
 		if natseethroughwearing = 0:
 			'Natasha is sitting on the bed, looking at some fashion magazines.'
-			
+
 			act 'Let''s go to the living room':
 				NatNoTV = 1
 				NatashaLoc = 4
 				gt 'natbelapt', 'livingroom'
-			end	
+			end
 		end
-		
+
 		act 'Talk with her': gt 'natbelapt', 'chat'
-		
+
 		if natpregday > 0 and daystart-natpregday > 90 and nataskedbaby ! daystart:
 			act 'Touch her belly':
 				nataskedbaby = daystart
@@ -466,9 +467,9 @@ if $ARGS[0] = 'natroom':
 				'Her tone is a lot less accusing than you''d expected. In fact, she seems... happy.'
 			end
 		end
-			
+
 		if lernHome ! 0: act 'Study together': gs 'natbelapt', 'study_together'
-		
+
 		if NatDolg > 0 and NatDolgDay <= daystart:
 			if NatashaQW > 1 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
@@ -557,7 +558,7 @@ if $ARGS[0] = 'natroom':
 					'When she''s decided on what to wear she gets dressed seeming not to care about you seeing her naked.'
 				end
 				gs 'arousal', 'voyeur', 5
-				act 'Let her dress': 
+				act 'Let her dress':
 					gs 'arousal', 'end'
 					gt 'natbelapt', 'natroom'
 				end
@@ -569,7 +570,7 @@ if $ARGS[0] = 'natroom':
 					'"Well then." You say in your most seductive voice. "Have you earned it?" As you teasingly lower your mouth to hers. You take your time, touching your lips together, then backing off slightly, pulling at her lower lip occasionally with your teeth before finally going in for a passionate kiss.'
 					gs 'arousal', 'kiss_give', 5, 'dom', 'lesbian'
 					gs 'stat'
-					
+
 					if NatashaQW > 7:
 						act 'Bare her breasts':
 							*clr & cla
@@ -603,7 +604,7 @@ if $ARGS[0] = 'natroom':
 									'The growing volume of her moans is rekindling the fire inside yourself. "A few touches and I might go over the edge again." You think to yourself.'
 									gs 'arousal', 'cuni_give', 5, 'lesbian'
 									gs 'stat'
-									
+
 									act 'Rub your pussy on hers':
 										*clr & cla
 										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex05.jpg"></center>'
@@ -620,7 +621,7 @@ if $ARGS[0] = 'natroom':
 											sexnutrition += 30 * scfeed
 											succubxp += 6
 										end
-										
+
 										gs 'stat'
 										act 'Continue': gt 'natbelapt', 'natroom'
 									end
@@ -633,13 +634,13 @@ if $ARGS[0] = 'natroom':
 									'She keeps one hand on your breast, softly pinching and pulling on your hard nipple as she starts focusing on sucking your engorged clit. You feel one of her fingers slip inside you again, adding even more pleasure.'
 									gs 'arousal', 'cuni', 5, 'lesbian'
 									gs 'stat'
-									
+
 									act 'Rub your pussy on hers':
 										*clr & cla
 										'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/natbedroomsex05.jpg"></center>'
 										'As you feel your orgasm near, you quickly get up from the bed and press Natasha down on her back, opening her legs wide. Her pussy is soaking wet as well. There are wet streaks on her inner thighs where her juices have been running down her legs.'
 										'After a moment of teasing her with your fingers, you straddle her, pressing your pussies wetly together as you begin quickly grinding against her. Natasha grabs your breasts and starts moaning "Yes <<$pcs_nickname>>... Please... Pleaaaaaah."'
-										$orgasm_txt = 'The feeling of her body writhing underneath yours as she orgasms sends you over the top as well. You keep grinding for a few more seconds before you start bucking under the intensity of your own orgasm.' 
+										$orgasm_txt = 'The feeling of her body writhing underneath yours as she orgasms sends you over the top as well. You keep grinding for a few more seconds before you start bucking under the intensity of your own orgasm.'
 										$orgasm_or = 'yes'
 										gs 'arousal', 'trib', 5, 'lesbian'
 
@@ -663,7 +664,7 @@ if $ARGS[0] = 'natroom':
 					end
 				end
 			end
-		else			
+		else
 			'With a startled look on her face she stammers "Oh, hi <<$pcs_nickname>>, I didn''t know you were coming over."'
 			'Amused by her obvious discomfort you offer: "Should I wait in the hallway?"'
 			'"N-No, it''s ok. It''s not all that different from in the girl''s locker rooms right?"'
@@ -742,7 +743,7 @@ if $ARGS[0] = 'hwundress':
 		act 'Tell her to strip (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'force'
-			natdoingHW = 1	
+			natdoingHW = 1
 			'"You know, I''m not feeling properly entertained over here." You say, feeling a bit bored. "I think you should lose some clothes, so I have something to look at."'
 			'"B-But what if my mom walks in?" Natasha asks in a trembling voice.'
 			act 'You can keep your bra and panties on':
@@ -771,7 +772,7 @@ if $ARGS[0] = 'hwundress':
 					gs 'stat'
 					act 'Continue': gt 'natbelapt', 'undressedhw'
 				end
-			end	
+			end
 		end
 	else
 		act 'Tell her to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -823,7 +824,7 @@ if $ARGS[0] = 'undressedhw':
 			else
 				'Natasha occasionally glances over her shoulder at you. Her face is flushed red, and her pussy is glistening wetly.'
 				'"You''re such a little slut, Natasha. I can see you''re getting wetter by the minute, you just love getting humiliated don''t you." You tell her, laughing as her face turns crimson.'
-			end	
+			end
 			'As she keeps working on your homework, you occasionally break Natasha''s concentration with more comments on her body. Each time you do so, she visibly loses her concentration.'
 		end
 		'After a while, Natasha gets up saying: "It''s done <<$pcs_nickname>>, can I please get dressed now?"'
@@ -842,11 +843,11 @@ if $ARGS[0] = 'afterhomework':
 	else
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/sex/nakedhomework2.jpg"></center>'
 	end
-	act 'Allow her to dress': 
+	act 'Allow her to dress':
 		natunderwear = 0
 		gt 'natbelapt', 'natroom'
 	end
-	
+
 	gs 'willpower', 'cuni', 'force'
 	if NatashaQW >= 7 and will_cost <= pcs_willpwr:
 		act 'Take off your own clothes (<<will_cost>> Willpower)':
@@ -868,7 +869,7 @@ if $ARGS[0] = 'afterhomework':
 				'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethrough00.jpg"></center>'
 				natseethroughwearing = 1
 				if natseethroughworn = 0:
-					natseethroughworn += 1						
+					natseethroughworn += 1
 					'"No, I don''t think so. For the rest of the day, you''re going to wear this." You say as you pull the see-through lingerie from your bag. "I just couldn''t resist buying it for you."'
 					'Natasha''s eyes fall on what you''re actually holding. She immediately notices that you can see right through the fabric.'
 					'"B-But... It hides nothing. I''d be practically naked." She stammers'
@@ -883,7 +884,7 @@ if $ARGS[0] = 'afterhomework':
 					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': 
+					act 'Continue':
 						natstayroom = 1
 						gt 'natbelapt', 'natroom'
 					end
@@ -900,7 +901,7 @@ if $ARGS[0] = 'afterhomework':
 					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': 
+					act 'Continue':
 						natstayroom = 1
 						gt 'natbelapt', 'natroom'
 					end
@@ -916,7 +917,7 @@ if $ARGS[0] = 'afterhomework':
 					gs 'arousal', 'voyeur', 5
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Continue': 
+					act 'Continue':
 						natstayroom = 1
 						gt 'natbelapt', 'natroom'
 					end
@@ -951,7 +952,7 @@ if $ARGS[0] = 'lick_feet':
 		'"That''s a good little girl." You tell her, smiling at her while she gently sucks on your toes one by one.'
 		'After a while, you get bored and get up.'
 		'You smile, "Fair enough, you are forgiven."'
-		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"' 
+		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"'
 		'You laugh, "500<b>₽</b> of debt is forgiven, fool. You will do everything I tell you until the entire debt is gone."'
 		act 'Continue': gt 'natbelapt', 'natroom'
 	end
@@ -965,7 +966,7 @@ if $ARGS[0] = 'lick_feet':
 		'You lie back and gently caress your pussy while you relish the feeling of her tongue on your feet. She alternates between licking your feet in long strokes of her tongue and gently sucking on your toes.'
 		'After a while, you get bored and get up.'
 		'You smile, "Fair enough, you are forgiven."'
-		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"' 
+		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"'
 		'You laugh, "500<b>₽</b> of debt is forgiven, fool. You will do everything I tell you until the entire debt is gone."'
 		gs 'arousal', 'foreplay', 5, 'humiliation'
 		gs 'arousal', 'end'
@@ -993,9 +994,9 @@ if $ARGS[0] = 'spit_face':
 		!!natknee
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/natknee.jpg"></center>'
-		'You collect the saliva in your mouth and, with relish, spit in Natasha''s face. She jerks and squeezes her eyes shut but makes no move to wipe the spit away even as some drips into her open mouth.' 
+		'You collect the saliva in your mouth and, with relish, spit in Natasha''s face. She jerks and squeezes her eyes shut but makes no move to wipe the spit away even as some drips into her open mouth.'
 		'You smile, "Fair enough, you are forgiven."'
-		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"' 
+		'Natasha opens her eyes and asks in disbelief, "It''s forgiven?"'
 		'You laugh, "500<b>₽</b> of debt is forgiven, fool. You will do everything I tell you until the entire debt is gone."'
 		act 'Continue': gt 'natbelapt', 'natroom'
 	end
@@ -1030,7 +1031,7 @@ if $ARGS[0] = 'lick_pussy':
 				'You are angry at this bitch, so you release your urine in Natasha''s face. She closes her eyes and bows her head down but does not recoil and silently accepts your golden shower, continuing to swallow until the very end.'
 				act 'Continue': gt 'natbelapt', 'natroom'
 			end
-		else 
+		else
 			act 'Make her stop':
 				*clr & cla
 				minut += 5
@@ -1076,7 +1077,7 @@ if $ARGS[0] = 'openlegs':
 	gs 'stat'
 	act 'Continue': gt 'natbelapt', 'natroom'
 end
-		
+
 if $ARGS[0] = 'straddleface':
 	*clr & cla
 	pcs_horny = 0
@@ -1106,9 +1107,9 @@ if $ARGS[0] = 'chat':
 	'<center><h4><font color="maroon">Natasha''s Room</font></h4></center>'
 	'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 	'The two of you lay on her bed and talk about a variety of topics.'
-	
+
 	act 'Stop talking': gt 'natbelapt','natroom'
-	
+
 	if npc_pregtalk['A16'] = 0 and kid = 0:
 		if natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday) < 200 and pregchem >= 3600:
 			*clr & cla
@@ -1151,7 +1152,7 @@ if $ARGS[0] = 'chat':
 			end
 		end
 	end
-	
+
 	if npc_pregtalk['A16'] = 0 and kid > 0:
 		if (natpregday > 0 and (daystart-natpregday) > 84 and (daystart-natpregday)< 200) or (natbabycount > 0) and pregchem >= 3600:
 			*clr & cla
@@ -1183,14 +1184,14 @@ if $ARGS[0] = 'chat':
 			end
 		end
 	end
-	
+
 	act 'Talk about money':
 		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 		'You talk about the price of clothes and cosmetics for a while. Natasha seems to know a lot about the latest fashion, even though she can''t afford it.'
-		if NatDolg <= 0 and money >= 2000 and natsub > 0:			
+		if NatDolg <= 0 and money >= 2000 and natsub > 0:
 			'Suddenly Natasha says: "Hey <<$pcs_nickname>>, you seem to have tons of cash, could you lend me some money, please? I swear I''ll pay you back before you even miss it."'
 			act 'Don''t give her the money': gt 'natbelapt', 'chat'
 			act 'Give her the money (2000 <b>₽</b>)':
@@ -1226,7 +1227,7 @@ if $ARGS[0] = 'chat':
 					act 'Stop talking': gt 'natbelapt', 'natroom'
 					act 'Keep talking': gt 'natbelapt', 'chat'
 				end
-			end	
+			end
 		elseif NatBelBestFrend >= 3 and NatDolg = 0 and money >= 5000 and natsub = 0:
 			'Natasha looks down in embarrassment. "<<$pcs_nickname>>, you have lots of money. Could you lend me 5000 <b>₽</b>? I will pay it back, I give you my word."'
 
@@ -1266,16 +1267,16 @@ if $ARGS[0] = 'chat':
 				act 'Stop talking': gt 'natbelapt', 'natroom'
 			end
 			if NatashaQW = 1:
-				act 'Demand repayment': 
+				act 'Demand repayment':
 					*clr & cla
 					minut += 15
 					if NatashaQW = 1: NatashaQW = 2
 					gs 'stat'
 					'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
-					'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"' 
+					'You decide not to reduce Natasha''s debt. You angrily confront her, demanding that she return the money to you, one way or another. Natasha curls up into a ball on her bed: "<<$pcs_nickname>>, I''m so sorry! I will do anything you say! Anything!"'
 					''
-					'Natasha looks at you with fearful eyes, and you''re getting some ideas as to how you could "use" her. She did say "anything," after all...' 
-					'You snarl at her with an evil hiss: "You''ll be my little pet until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"' 
+					'Natasha looks at you with fearful eyes, and you''re getting some ideas as to how you could "use" her. She did say "anything," after all...'
+					'You snarl at her with an evil hiss: "You''ll be my little pet until you''ve worked off every last Kopeck. And don''t you dare tell anyone about this!"'
 					'You give her a soft slap on the cheek to test your newfound power over her rather than to hurt her, but she flinches and nods profusely. Looks like you''ve got your own little slave now.'
 					act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 				end
@@ -1302,7 +1303,7 @@ if $ARGS[0] = 'chat':
 			end
 		else
 			act 'Stop talking': gt 'natbelapt', 'natroom'
-			act 'Keep talking': gt 'natbelapt', 'chat'	
+			act 'Keep talking': gt 'natbelapt', 'chat'
 		end
 	end
 
@@ -1326,7 +1327,7 @@ if $ARGS[0] = 'chat':
 		'<center><h4><font color="maroon">Natasha''s Room</font></h4></center>'
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/bedtalk.jpg"></center>'
 		'You talk with Natasha about her mother. She tells you that her mother seems to be unhappy a lot of the time. She thinks it''s because of how dreary her job at the garment factory is.'
-		
+
 		act 'Keep talking': gt 'natbelapt', 'chat'
 		act 'Stop talking': gt 'natbelapt', 'natroom'
 	end
@@ -1381,7 +1382,7 @@ if $ARGS[0] = 'natknows':
 		'"It looks like I got knocked up by <<$wombthfath>>."'
 		'"Well, I hope for the best for both of you. After our babies are both born, we should start setting up play dates." She pauses for a moment before adding, "Honestly, I''m happy that I won''t be going through this alone."'
 	end
-	act 'Continue':gt 'natbelapt', 'natroom'	
+	act 'Continue':gt 'natbelapt', 'natroom'
 end
 
 !When pregnancy fetish is added, another reaction will be added here
@@ -1402,13 +1403,13 @@ if $ARGS[0] = 'natknows1':
 		'"Yeah, it seems like he does," you reply. "But don''t worry, we''ll make sure he has plenty of opportunities to keep getting you pregnant. Who knows how many of his children you''ll have before he''s finished."'
 		'Natasha''s face goes completely red with embarrassment, and she starts to mumble something before you cut her off with a passionate kiss. When you finally break the kiss, she is still visibly red, but she isn''t protesting your suggestion. You know what she wants.'
 	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
-		'"Yeah. I guess I needed him to give me another baby before I could be satisfied," you say jokingly.' 
+		'"Yeah. I guess I needed him to give me another baby before I could be satisfied," you say jokingly.'
 		'"Well, I hope you find satisfaction," she laughs.'
 	elseif $wombthfath ! 'Kolka' and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1:
 		'"No, I needed to test drive someone else before I could decide what father I like best."'
 		'"If you''re going that route, you might as well keep shopping around." You laugh together for a while before moving on to another topic.'
 		end
-	act 'Continue':gt 'natbelapt', 'natroom'	
+	act 'Continue':gt 'natbelapt', 'natroom'
 end
 
 if $ARGS[0] = 'snack':
@@ -1455,7 +1456,7 @@ if $ARGS[0] = 'snack':
 		act 'Back to her room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 	end
 end
-	
+
 if $ARGS[0] = 'livingroom':
 	$menu_loc = 'natbelapt'
 	$menu_arg = 'livingroom'
@@ -1469,7 +1470,7 @@ if $ARGS[0] = 'livingroom':
 ! Needs actions like watching tv
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/living.jpg"></center>'
 	'Most of the living room is occupied by an old but comfortable looking couch. It''s big enough to sleep in. In front of it stands an old tiny TV.'
-	
+
 	! Randomly detemines what is on TV to keep it from being the same every time.
 	ShowRand = rand(0,8)
 	if ShowRand = 0:
@@ -1491,14 +1492,14 @@ if $ARGS[0] = 'livingroom':
 	elseif ShowRand = 8:
 		$ShowMsg = 'a porno'
 	end
-	
+
 	if NatashaLoc = 4 and NatNoTV = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/tvsnack.jpg"></center>'
 		'"I''ll go grab us a snack, pick something good to watch." Natasha says as she heads to the kitchen.'
 		! If you haven''t progressed far enough or Natasha''s mother is home you can''t pick porn
 		if NatashaQW < 5 or NatashaMotherHome = 1:
-			if ShowRand = 8: 
+			if ShowRand = 8:
 				ShowRand = 5
 				$ShowMsg = 'a romantic movie'
 			end
@@ -1526,9 +1527,9 @@ if $ARGS[0] = 'livingroom':
 			gs 'stat'
 			act 'Let''s go to your room': NatashaLoc = 2 & gt 'natbelapt', 'natroom'
 		end
-	elseif NatashaLoc = 4 and NatNoTV = 0:	
+	elseif NatashaLoc = 4 and NatNoTV = 0:
 		'Natasha is sitting on the couch watching <<$ShowMsg>>.'
-		
+
 		act 'Join her':
 			if ShowRand ! 8:
 				*clr & cla
@@ -1569,12 +1570,12 @@ if $ARGS[0] = 'livingroom':
 					elseif city_porn > 250:
 						YourPorn = rand(0,9)
 					end
-					
+
 					if YourPorn = 1:
 						if pav_slut < 50:
-							'You are startled to see yourself on the screen, unsure how you feel about Natasha knowing. "Best to check the damage." You think to yourself as you approach the couch.'				
+							'You are startled to see yourself on the screen, unsure how you feel about Natasha knowing. "Best to check the damage." You think to yourself as you approach the couch.'
 						else
-							'You see yourself on the screen. "It would have happened sooner or later." You smile to yourself as you approach the couch.'	
+							'You see yourself on the screen. "It would have happened sooner or later." You smile to yourself as you approach the couch.'
 						end
 						'Natasha doesn''t notice you until she feels the couch move as you sit down next to her. She jumps in surprise and quickly adjusts her skirt to hide her wet panties, completely red in the face from a mixture of arousal and embarrassment at being caught watching porn featuring you.'
 						if NatashaWatchedYourPorn = 0:
@@ -1631,10 +1632,10 @@ if $ARGS[0] = 'kitchen':
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/kitchen.jpg"></center>'
 	'The kitchen is small but has all the necessary things. There is a stove, a fridge, a sink, and a tiny dining table. Everything looks sparkling clean.'
-	
+
 	act 'Leave': gt 'natbelapt','hallway'
 	act 'Look in the fridge': gt 'natbelapt', 'fridge'
-	
+
 	!! Kitchen events
 	if rand(0,4) = 0 and natseethroughwearing = 1 and natseehtroughkitchen = 0:
 		'<center><img src="images/characters/pavlovsk/school/girl/natasha/seethroughkitchen01.jpg"></center>'
@@ -1685,7 +1686,7 @@ if $ARGS[0] = 'kitchen':
 		act 'Leave': gt 'natbelapt','hallway'
 		act 'Look in the fridge': gt 'natbelapt', 'fridge'
 	end
-	
+
 	dynamic $driwater
 	dynamic $dritea
 	dynamic $fill_bottle
@@ -1698,11 +1699,11 @@ if $ARGS[0] = 'fridge':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/fridge.jpg"></center>'
 	'You open the fridge and see that it mostly holds healthy things. Lots of vegetables, water, a bottle of lemonade and a couple of bottles of wine.'
-	
+
 	act 'Close the refrigerator': gt 'natbelapt', 'kitchen'
-	
+
 	if HaveCucumber = 0:
-		act 'Take a cucumber': 
+		act 'Take a cucumber':
 			cla
 			HaveCucumber = 1
 			'You take a cucumber out of the fridge. This could come in handy.'
@@ -1724,13 +1725,13 @@ if $ARGS[0] = 'natmother':
 	'<center><b><font color = maroon>Natasha''s mother''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/momroom.jpg"></center>'
 	'The room is fairly bare, but everything is organized neatly, and it''s spotlessly clean. There is a bed, a big closet, and some bedstands next to the bed with lamps on them. Everything looks like it''s cleaned on a daily basis.'
-	
+
 	if CaughtByNatMomHitachi >= 1:
 		$NatMomVibName = 'hitachi'
 	else
 		$NatMomVibName = 'big vibrator'
 	end
-	
+
 	if rand(0,4) = 0 and hour > 21 and NatashaMotherHome = 1:
 		'As you walk through the hallway, you hear a buzzing noise coming from <<$NatashaMotherNickname>>''s room'
 		'Unable to resist your curiosity you push the door open a tiny bit so that you can peek inside.'
@@ -1744,14 +1745,14 @@ if $ARGS[0] = 'natmother':
 			'She is eagerly rubbing her <<$NatMomVibName>> on her pussy. Even though she''s obviously trying to be quiet, her moans of pleasure keep getting louder and louder. You feel your own pussy getting wet in response.'
 			gs 'arousal', 'voyeur', 3
 			gs 'stat'
-			
+
 			act 'Keep looking':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natmomhitachi12.jpg"></center>'
 				'After a few more minutes you notice <<$NatashaMotherNickname>> pressing a button, and the <<$NatMomVibName>> starts buzzing more loudly. She starts to press it against her pussy even harder. It doesn''t take long before you can clearly see her have an orgasm. She closes her legs around the <<$NatMomVibName>> to keep it firmly on her pussy while she bucks and lets out gasping breaths.'
 				gs 'arousal', 'voyeur', 3
 				gs 'stat'
-				
+
 				act 'Keep looking':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/sex/natmomhitachi13.jpg"></center>'
@@ -1765,7 +1766,7 @@ if $ARGS[0] = 'natmother':
 					end
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Leave':gt 'natbelapt','hallway'
 				end
 			end
@@ -1786,7 +1787,7 @@ if $ARGS[0] = 'natmother':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/natbelapt/natmomsleep2.jpg"></center>'
 				'You look into the bedroom and see <<$NatashaMotherNickname>>, tossing in her sleep in her bra and panties. As you''re watching she rolls onto her back and puts her hand in her panties. "That must be one hell of an enjoyable dream." You think to yourself. Not wanting to disturb her you close the door and leave.'
 				gs 'arousal', 'voyeur', 4
-			end			
+			end
 			gs 'arousal', 'end'
 			gs 'stat'
 		end

+ 56 - 55
locations/nichTaras.qsrc

@@ -13,7 +13,7 @@ timeHidden = 0
 if $ARGS[0] = 'abdIntro':
 	$nichKatinkaName = 'the other girl'
 	$nichKatinkaNameUC = 'The other girl'
-		
+
 	if nichAbdStage = 0:
 		menu_off = 1
 		InSleep = 0
@@ -22,7 +22,7 @@ if $ARGS[0] = 'abdIntro':
 		gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro1.jpg"></center>'
-		'You don''t know how much time has passed when you finally regain consciousness. Maybe minutes? Hours? A whole day?'	
+		'You don''t know how much time has passed when you finally regain consciousness. Maybe minutes? Hours? A whole day?'
 		*nl
 		'Your limbs hurt and you try to stretch them. To no avail. Your feet and wrists are chained to the floor while something in your back pushes your belly up, forcing you into an awkward backwards bent position. The worst thing is that you are apparently naked.'
 		*nl
@@ -35,35 +35,35 @@ if $ARGS[0] = 'abdIntro':
 		end
 		act 'Wait':
 			nichAbdStage = 10
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 10:
 		minut += 60
-		gs 'pain', 'back', 'bind' 
-		gs 'pain', 'shoulders', 'bind' 
+		gs 'pain', 'back', 'bind'
+		gs 'pain', 'shoulders', 'bind'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro2.jpg"></center>'
 		'You wait for what appears to be an eternity.'
 		*nl
 		'Your back starts to hurt and you try shift into a more comfortable position. You once again realize that that''s futile. You are forced into this painful position until anybody frees you.'
-		
+
 		act 'Call for help':
 			'You scream for help as loud as you possibly can. Nothing happens. Did anybody hear you at all?'
 		end
 		if pcs_sleep <= 40:
 			act 'Try to sleep':
 				nichAbdStage = 20
-				gt 'nichTaras','abdIntro' 
+				gt 'nichTaras','abdIntro'
 			end
 		end
 		act 'Wait':
 			nichAbdStage = 21
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 20:
 		minut += 120
 		pcs_sleep += 20
-		gs 'pain', 'pubic', 'spank' 
+		gs 'pain', 'pubic', 'spank'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
 		'You are just to exhausted to stay awake any longer. You fall into an uneasy sleep.'
@@ -88,12 +88,12 @@ if $ARGS[0] = 'abdIntro':
 		end
 		act 'Listen':
 			nichAbdStage = 30
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 21:
 		minut += 120
-		gs 'pain',5, 'pubic', 'hit' 
-		gs 'stat'	
+		gs 'pain',5, 'pubic', 'hit'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro3.jpg"></center>'
 		'Locked down like this there is nothing you can do than continue waiting.'
 		*nl
@@ -113,17 +113,17 @@ if $ARGS[0] = 'abdIntro':
 		*nl
 		'"Shut up, slut! I am sure you''re having a lot of questions right now. But there are only a few things you need to know."'
 		act 'Object':
-			gs 'pain',5, 'pubic', 'hit' 
+			gs 'pain',5, 'pubic', 'hit'
 			gs 'stat'
 			'Just as you open your mouth you feel the whip once more. Taras obviously doesn''t want you to speak right now.'
 		end
 		act 'Listen':
 			nichAbdStage = 30
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 30:
-		gs 'pain', 'breasts', 'twist' 
-		gs 'stat'	
+		gs 'pain', 'breasts', 'twist'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro4.jpg"></center>'
 		if nichTarasAbduction = 10:
 			'"I bet you''re wondering how you got here. You see, you annoyed Mistress Gala. Being the classy woman she is she can''t tolerate skanks like yourself in her household."'
@@ -142,17 +142,17 @@ if $ARGS[0] = 'abdIntro':
 		'"Do you understand?"'
 		act 'Yes sir':
 			nichAbdStage = 40
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 		act 'No way!':
-			gs 'pain',6, 'nipples', 'twist' 
+			gs 'pain',6, 'nipples', 'twist'
 			gs 'stat'
 			'"No! You can''t ..." you are interrupted by him painfully twisting your nipples.'
 			'"I''m asking again: do you understand?"'
 		end
 	elseif nichAbdStage = 40:
-		gs 'pain', 'clitoris', 'twist' 
-		gs 'stat'	
+		gs 'pain', 'clitoris', 'twist'
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/intro5.jpg"></center>'
 		'There is no use in resistance right now. This man will punish you until you say what he wants to hear.'
 		*nl
@@ -171,7 +171,7 @@ if $ARGS[0] = 'abdIntro':
 		'He unbottons his pants and pulls them down along with his underpants. He clearly wants you to see his erect penis. Does he really expect you to suck it?'
 		act 'Further':
 			nichAbdStage = 50
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 50:
 		nichKatinkaPresent = 1
@@ -193,7 +193,7 @@ if $ARGS[0] = 'abdIntro':
 		'Once she is done Taras kicks her into the belly. "Get up, lazy slut!"'
 		act 'Further':
 			nichAbdStage = 60
-			gt 'nichTaras','abdIntro' 
+			gt 'nichTaras','abdIntro'
 		end
 	elseif nichAbdStage = 60:
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/hogtie1.jpg"></center>'
@@ -217,11 +217,11 @@ if $ARGS[0] = 'abdIntro':
 			nichTarasLeave = hour * 60 + minut + 20
 			nichTarasReturn = rand(19,23)
 			gt 'nichTaras','katinka', 'wash'
-			
+
 		end
 	end
 elseif $ARGS[0] = 'katinka':
-	
+
 	if $ARGS[1] = 'desc':
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/katinka1.jpg"></center>'
 		act 'Talk':
@@ -238,7 +238,7 @@ elseif $ARGS[0] = 'katinka':
 					xgt 'nichTaras','katinka','talkEnd'
 				end
 			end
-			
+
 		end
 		act 'Back':
 			gt 'nichTaras','dungeon'
@@ -256,6 +256,7 @@ elseif $ARGS[0] = 'katinka':
 		'<center><img <<$set_imgh>> src="images/characters/city/taras/washing1.jpg"></center>'
 		'<<$nichKatinkaNameUC>> takes a bottle of shower gel and covers you in it. Being all tied up there is nothing you can do to prevent it. Her touch feels soft on your skin. Then she uses a hose to clean you. The water is ice cold. She gently dries you with a towel before combing your hair.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+		noShampoo = 1
 		dynamic $showerdin
 		pcs_hairbsh = 1
 		gs 'stat'
@@ -264,7 +265,7 @@ elseif $ARGS[0] = 'katinka':
 		end
 	end
 elseif $ARGS[0] = 'dungeon':
-	
+
 	if nichTarasLeave <= hour * 60 + minut and nichKatinkaPresent ! 0:
 		'You hear Taras returning from upstairs. He is dressed for his job.'
 		'"Time to get you back to your own room." he grabs <<$nichKatinkaName>> by her hair and pulls her back upstairs. You hear the locks once again being locked.'
@@ -282,7 +283,7 @@ elseif $ARGS[0] = 'dungeon':
 		else
 			'<center><b>Basement</b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/dungeon.jpg"></center>'
-			'You are in a basement. There are several metal objects bolted to the ground and to the walls. They are used for chaining up prisoners. There is also a hose for cleaning.'	
+			'You are in a basement. There are several metal objects bolted to the ground and to the walls. They are used for chaining up prisoners. There is also a hose for cleaning.'
 			*nl
 			'In one corner of the room stands an <a href="exec:minut += 10&gt ''nichTaras'', ''dungeon'', ''bed''">old bed</a> with a dirty mattress on it.'
 			*nl
@@ -371,7 +372,7 @@ elseif $ARGS[0] = 'dungeon':
 				nichTarasMirrorCount += 1
 				*clr & cla
 				'It takes quit some effort by finally you manage to use your shoulder to throw the mirror over. The frame took some damage but the glass seems to be still intact.'
-				
+
 				act 'Back':
 					gt 'nichTaras','dungeon'
 				end
@@ -392,9 +393,9 @@ elseif $ARGS[0] = 'session':
 				nichTarasSession = 1
 			end
 		end
-		
+
 	end
-	
+
 	if nichTarasSession = -1:
 		if nichTarasSessionStage = 0:
 			!! Mirror thrown over for first time
@@ -460,7 +461,7 @@ elseif $ARGS[0] = 'session':
 			'Once Taras is done you are reduced to a sobbing mess.'
 			'"Since you missed the central aspect of this lesson I think you could use some extra time to finally get the point."'
 			'With these words he leaves the basement, leaving you hanging from the ceiling with the vile dildo in your mouth and your whole body covered in bruises.'
-			
+
 			act 'Try to break free':
 				'You pull on your restraints the best you can, but they don''t give in. You are tightly locked.'
 			end
@@ -487,17 +488,17 @@ elseif $ARGS[0] = 'session':
 			!! Sveta fell asleep after 10
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1d.jpg"></center>'
 			'Despite your position being very uncomfortable you finally manage to fall asleep.'
-			if hour < 6: 
-				nichSleepTime = (6 - hour) * 60 - minut 
-			else	
-				nichSleepTime = (30 - hour) * 60 - minut 
+			if hour < 6:
+				nichSleepTime = (6 - hour) * 60 - minut
+			else
+				nichSleepTime = (30 - hour) * 60 - minut
 			end
-			
+
 			pcs_sleep = min(100 , pcs_sleep + nichSleepTime / 4)
 			minut += nichSleepTime
 			killvar 'nichSleepTime'
 			gs 'stat'
-			
+
 			*nl
 			'You don''t know for how long you slept when a dash of cold water pulls you out of your dreams.'
 			'You immidiately realize that you or no longer bolted to the ground. Instead you have already bound in an hogite again.'
@@ -558,17 +559,17 @@ elseif $ARGS[0] = 'session':
 			!! Sveta fell asleep after 20
 			'<center><img <<$set_imgh>> src="images/characters/city/taras/mirrorEvent1g.jpg"></center>'
 			'Despite the hard cold floor being very uncomfortable to lie on you finally manage to fall asleep.'
-			if hour < 6: 
-				nichSleepTime = (6 - hour) * 60 - minut 
-			else	
-				nichSleepTime = (30 - hour) * 60 - minut 
+			if hour < 6:
+				nichSleepTime = (6 - hour) * 60 - minut
+			else
+				nichSleepTime = (30 - hour) * 60 - minut
 			end
-			
+
 			pcs_sleep = min(100 , pcs_sleep + nichSleepTime / 4)
 			minut += nichSleepTime
 			killvar 'nichSleepTime'
 			gs 'stat'
-			
+
 			*nl
 			'You don''t know for how long you slept when a dash of cold water pulls you out of your dreams.'
 			'You immidiately realize that you are no longer bolted to the ground. Instead you have already bound in an hogite again.'
@@ -606,7 +607,7 @@ elseif $ARGS[0] = 'session':
 				*nl
 				'"Three, two, one, <b>start</b>!"'
 				act 'Move forward':
-					
+
 				end
 				act 'Don''t move':
 					*clr & cla
@@ -617,7 +618,7 @@ elseif $ARGS[0] = 'session':
 					*nl
 					'"You don''t want to get me angry, slut. Get moving or you will regret it."'
 					act 'Move forward':
-						
+
 					end
 					act 'Stand still':
 						*clr & cla
@@ -693,19 +694,19 @@ elseif $ARGS[0] = 'session':
 										else
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/characters/city/taras/punishment1a.jpg"></center>'
-									
+
 											'Being placed in this crate and all most of your weight resting on your shoulders while foul smelling urine is slowly drying on your head is a bad position to sleep in. But your need for sleep is too strong and so you fall asleep soon.'
-											if hour < 6: 
-												nichSleepTime = (6 - hour) * 60 - minut 
-											else	
-												nichSleepTime = (30 - hour) * 60 - minut 
+											if hour < 6:
+												nichSleepTime = (6 - hour) * 60 - minut
+											else
+												nichSleepTime = (30 - hour) * 60 - minut
 											end
-											
+
 											pcs_sleep = min(100 , pcs_sleep + nichSleepTime / 4)
 											minut += nichSleepTime
 											killvar 'nichSleepTime'
 											gs 'stat'
-											
+
 											*nl
 											'You don''t know for how long you slept when a dash of cold water pulls you out of your dreams.'
 											'You immidiately realize that you are no longer tied in the create. Instead you have already bound in an hogite again.'
@@ -716,17 +717,17 @@ elseif $ARGS[0] = 'session':
 												killvar 'nichTarasSessionStage'
 												gt 'nichTaras','katinka', 'wash'
 											end
-										
+
 										end
 									end
-								end	
+								end
 							end
 						end
 					end
 				end
 			end
 		end
-		
+
 	end
 elseif $ARGS[0] = 'van':
 	'<center><img <<$set_imgh>> src="images/characters/city/taras/van.jpg"></center>'

+ 1 - 0
locations/placer_sex.qsrc

@@ -14,6 +14,7 @@ if frost > 0: frost = 0
 
 $din_dush  = {
 	*clr & cla
+	noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 19 - 2
locations/porn_view.qsrc

@@ -242,6 +242,7 @@ if seepornofut >= 10:
 
 		if pcs_horny >= 70: seepornofut += 1
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -254,7 +255,7 @@ if seepornofut >= 10:
 		func('porn_view_strings', 'view_14'+iif(pcs_pubes>10,'_bush','_no_bush'))
 
 		func('porn_view_strings', 'view_14_next')
-
+		noShampoo = 1
 		dynamic $showerdin
 		pcs_horny = 0
 		stat['hj'] += 2
@@ -268,7 +269,7 @@ if seepornofut >= 10:
 		func('porn_view_strings', 'view_15_next'+iif(pcs_vag=0,'_virgin',iif(mesec>0,'_wdays','')))
 
 		func('porn_view_strings', 'view_15_fin')
-
+		noShampoo = 1
 		dynamic $showerdin
 		pcs_horny = 0
 		stat['hj'] += 3
@@ -301,6 +302,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		brotherstat['vaginal'] += 1
 		gs 'cum_call', 'face', $boy
+		noShampoo = 1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -322,6 +324,7 @@ if seepornofut >= 10:
 		stat['hj'] += 2
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
+		noShampoo = 1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -335,6 +338,7 @@ if seepornofut >= 10:
 		swallow += 3
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
+		noShampoo = 1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -354,6 +358,7 @@ if seepornofut >= 10:
 		swallow += 3
 		pcs_horny = 0
 		gs 'cum_call', 'face', $boy
+		noShampoo = 1
 		dynamic $showerdin
 		seepornofut += 1
 		exit
@@ -399,6 +404,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		gang += 1
 		swallow += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -420,6 +426,7 @@ if seepornofut >= 10:
 		stat['bj'] += 3
 		gang += 1
 		seepornofut += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -440,6 +447,7 @@ if seepornofut >= 10:
 		pcs_horny = 0
 		stat['bj'] += 3
 		gang += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -459,6 +467,7 @@ if seepornofut >= 10:
 				stat['bj'] += 3
 				minut += 20
 				act 'Go':
+					noShampoo = 1
 					dynamic $showerdin
 					killvar '$_zz_boy_arr'
 					minut += iif(seepornofut < 4,rand(15,30),rand(60,80))
@@ -472,6 +481,7 @@ if seepornofut >= 10:
 		gang += 1
 		seepornofut += 1
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -508,6 +518,7 @@ if seepornofut >= 10:
 		stat['bj'] += 2
 		swallow += 2
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -546,6 +557,7 @@ if seepornofut >= 10:
 		end
 		gang += 1
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -564,6 +576,7 @@ if seepornofut >= 10:
 		seepornofut += 1
 		gang += 1
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -575,6 +588,7 @@ if seepornofut >= 10:
 		seepornofut += 1
 		gang += 1
 		pcs_horny = 0
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -599,6 +613,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -626,6 +641,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end
@@ -645,6 +661,7 @@ if seepornofut >= 10:
 		end
 		pcs_horny = 0
 		gang += 1
+		noShampoo = 1
 		dynamic $showerdin
 		exit
 	end

+ 98 - 17
locations/pornfilm.qsrc

@@ -101,7 +101,11 @@ if $ARGS[0] = '1':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Shower':gt 'pornstudio', 'shower'
+			if shampoo > 0:
+				act 'Take a shower':gt 'pornstudio', 'shower'
+			else
+				'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+			end
 			act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 		end
 	end
@@ -184,7 +188,12 @@ if $ARGS[0] = '2':
 						'You keep your eyes fixed on his, as you gently lick every last drop of sperm from his cock.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				end
@@ -285,7 +294,12 @@ if $ARGS[0] = '3':
 							'Looking it to his eyes adoringly, you meticulously lick all the cum off his dick.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Shower':gt 'pornstudio', 'shower'
+
+							if shampoo > 0:
+								act 'Take a shower':gt 'pornstudio', 'shower'
+							else
+								'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+							end
 							act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 						end
 					end
@@ -403,7 +417,12 @@ if $ARGS[0] = '4':
 								'You keep look deep into his eyes, then lick and kiss his sperm covered cock until it''s thoughly cleaned.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Shower':gt 'pornstudio', 'shower'
+
+								if shampoo > 0:
+									act 'Take a shower':gt 'pornstudio', 'shower'
+								else
+									'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+								end
 								act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 							end
 						end
@@ -514,7 +533,12 @@ if $ARGS[0] = '5':
 						gs 'stat'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				end
@@ -641,7 +665,12 @@ if $ARGS[0] = '6':
 							gs 'stat'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Shower':gt 'pornstudio', 'shower'
+
+							if shampoo > 0:
+								act 'Take a shower':gt 'pornstudio', 'shower'
+							else
+								'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+							end
 							act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 						end
 					end
@@ -720,7 +749,12 @@ if $ARGS[0] = '7':
 						$orgasm_or = 'no'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				else
@@ -741,7 +775,12 @@ if $ARGS[0] = '7':
 						$orgasm_or = 'yes'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				end
@@ -851,7 +890,12 @@ if $ARGS[0] = '8':
 				end
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Shower':gt 'pornstudio', 'shower'
+
+				if shampoo > 0:
+					act 'Take a shower':gt 'pornstudio', 'shower'
+				else
+					'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+				end
 				act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 			end
 		end
@@ -959,7 +1003,12 @@ if $ARGS[0] = '9':
 				end
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Shower':gt 'pornstudio', 'shower'
+
+				if shampoo > 0:
+					act 'Take a shower':gt 'pornstudio', 'shower'
+				else
+					'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+				end
 				act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 			end
 		end
@@ -1152,7 +1201,12 @@ if $ARGS[0] = '10':
 				gs 'stat'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Shower':gt 'pornstudio', 'shower'
+
+				if shampoo > 0:
+					act 'Take a shower':gt 'pornstudio', 'shower'
+				else
+					'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+				end
 				act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 			end
 		end
@@ -1259,7 +1313,12 @@ if $ARGS[0] = '11':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk'+rand(1,3)+'.mp4" height="200">'
 						'The scene ends with you putting on your dress, and stepping out the door, with the four guy''s load still inside you.'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				else
@@ -1278,7 +1337,12 @@ if $ARGS[0] = '11':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk'+rand(1,3)+'.mp4" height="200">'
 						'The scene ends with you putting on your dress, and stepping out the door, with the four guy''s load still inside you.'
-						act 'Shower':gt 'pornstudio', 'shower'
+
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				end
@@ -1368,7 +1432,11 @@ if $ARGS[0] = '12':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk'+rand(1,3)+'.mp4" height="200">'
 						'The scene ends with you putting on your dress, and stepping out the door, with the four guy''s load still inside you.'
-						act 'Shower':gt 'pornstudio', 'shower'
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				else
@@ -1387,7 +1455,11 @@ if $ARGS[0] = '12':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/pornwalk'+rand(1,3)+'.mp4" height="200">'
 						'The scene ends with you putting on your dress, and stepping out the door, with the four guy''s load still inside you.'
-						act 'Shower':gt 'pornstudio', 'shower'
+						if shampoo > 0:
+							act 'Take a shower':gt 'pornstudio', 'shower'
+						else
+							'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+						end
 						act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 					end
 				end
@@ -1504,7 +1576,11 @@ if $ARGS[0] = '13':
 				end
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Shower':gt 'pornstudio', 'shower'
+				if shampoo > 0:
+					act 'Take a shower':gt 'pornstudio', 'shower'
+				else
+					'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+				end
 				act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 			end
 		end
@@ -1687,7 +1763,12 @@ if $ARGS[0] = '14':
 		gs 'arousal', 'vaginal', 360, 'gangbang'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Shower':gt 'pornstudio', 'shower'
+
+		if shampoo > 0:
+			act 'Take a shower':gt 'pornstudio', 'shower'
+		else
+			'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+		end
 		act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
 	end
 end

+ 1 - 0
locations/postevents.qsrc

@@ -116,6 +116,7 @@ if $ARGS[0] = '1-1':
 		act 'Reassure him he did nothing wrong':
 			*clr & cla
 			minut += 15
+			noShampoo = 1
 			dynamic $showerdin
 			gs 'stat'
 			postmarriedQW = 2

+ 72 - 67
locations/rolanbath.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	cla & *clr
 	gs 'stat'
 	if RolanLoc[hour] = 7:
-		'Rolan is here.'		
+		'Rolan is here.'
 		if RAND(0,100) >= 30:
 			gt 'rolanbath', 'ev'
 		else
@@ -29,15 +29,15 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathroomnew.jpg"></center>'
 		'The bathroom is in much better shape since you worked on it.'
 	end
-	
+
 	'A <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair hangs over the sink.'
-	
+
 	if rolanworker = 2 and (RolanLoc[hour] = 9 or RolanLoc[hour] = 10):
-!	if rolanworker = 2 and RolanLoc[hour] = 9 or RolanLoc[hour] = 10:	
+!	if rolanworker = 2 and RolanLoc[hour] = 9 or RolanLoc[hour] = 10:
 		if workertool = 0:
 			act 'Get some tools': gt 'rolanbath', 'tools'
 		elseif workertool = 1:
-			act 'Look for concrete mix': gt 'rolanapt','hallway'	
+			act 'Look for concrete mix': gt 'rolanapt','hallway'
 		elseif workertool = 2:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/girlpow.jpg"></center>'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 	act 'Take a shower (0:15)':
 		*clr & cla
 		minut += 15
-		if shampoo > 0: shampoo -= 1
+		noShampoo = 1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 			pcs_horny += rand(0,2)
 			*nl
 			'You try to forget that Rolan''s bathroom door doesn''t have a latch.'
-			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if Rolan was to enter at the wrong time.'	
+			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if Rolan was to enter at the wrong time.'
 			if rand(0,3) = 0:
 				act 'Sing in the shower':
 					cla & *clr
@@ -100,21 +100,21 @@ if $ARGS[0] = 'start':
 					'As the jet of warm water begins to caress you, you hear a noise. You call out, "Rolan, is that you?" You don''t hear a response. "Bah! Probably just me being paranoid."'
 					cumspclnt = 8
 					gs 'cum_cleanup'
-					if $pantyworntype ! 'none' and rolan_steal_day ! daystart: 
-						gs 'panties', 'dispose' 
+					if $pantyworntype ! 'none' and rolan_steal_day ! daystart:
+						gs 'panties', 'dispose'
 						rolan_panty_day = daystart
 						rolan_panty_count -= 1
 						if rolanpantyQW =< 1: rolanpantyQW = 1
-                    end
-					act 'Finish showering': 
+					end
+					act 'Finish showering':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathcold.jpg"></center>'
 						*nl
 						'The water is suddenly ice cold, "Ahhh! I must have used up all the hot water!"'
 						act 'Dry yourself':
 							cla & *clr
-							minut += 5	
-!!							gs 'rolanbath', 'rolansteal'	
+							minut += 5
+!!							gs 'rolanbath', 'rolansteal'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathtowel1.jpg"></center>'
 							*nl
 							'You wrap yourself with a towel before exiting the shower, just to be cautious.'
@@ -124,9 +124,9 @@ if $ARGS[0] = 'start':
 								cumspclnt = 8
 								gs 'cum_cleanup'
 							end
-							act'Quickly get dressed': gt 'rolanbath','dryOff'  
-						end	
-					end	
+							act'Quickly get dressed': gt 'rolanbath','dryOff'
+						end
+					end
 				end
 			elseif rand(0,3) = 2:
 				act 'Uh..? Is someone there?':
@@ -151,6 +151,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
+								noShampoo = 1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -181,9 +182,9 @@ if $ARGS[0] = 'start':
 			if pcs_horny >= 40:
 				act 'Use the shower head on your pussy':
 					cla & *clr
-					minut += 10					
+					minut += 10
 					'<center><video src="images/shared/home/bathroom/wash2.mp4"></center>'
-					*nl	
+					*nl
 					'You know Rolan isn''t in here.'
 					*nl
 					'You place the shower head onto your pussy and a powerful jet of warm water begins to caress you.'
@@ -203,7 +204,7 @@ if $ARGS[0] = 'start':
 					'<center><video src="images/shared/home/bathroom/dush.mp4"></center>'
 					*nl
 					'You know Rolan isn''t in here.'
-					*nl	
+					*nl
 					'No, Rolan is a good guy, he wouldn''t come into the bathroom while you''re showering.'
 					if hypnoAddict ! 0:
 						'You unconsciously avoid spraying water into your vagina.'
@@ -212,15 +213,15 @@ if $ARGS[0] = 'start':
 						gs 'cum_cleanup'
 					end
 					act 'Dry off': gt $loc, 'start'
-				end	
-			end	
+				end
+			end
 		end
 		dynamic $preshave
 		dynamic $brit
 !!		dynamic $dryOff
 	end
-!!gs 'arousal', 'masturbate', 20	
-!!bath 
+!!gs 'arousal', 'masturbate', 20
+!!bath
 	act 'Have a bath (0:30)':
 		cla
 		*clr
@@ -229,6 +230,7 @@ if $ARGS[0] = 'start':
 		pcs_sweat = 7 + rand(0,4)
 		pcs_mood += 20
 		pcs_skin += 1
+		noShampoo = 1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash4.jpg"></center>'
@@ -242,7 +244,7 @@ if $ARGS[0] = 'start':
 		elseif sh_rolan_bazar >= 5:
 			pcs_horny += rand(0,2)
 			'You''re still not used to having Rolan wandering around, especially with a broken door.'
-			'Starting to soap yourself you unwittingly turn your attention to your breasts...'	
+			'Starting to soap yourself you unwittingly turn your attention to your breasts...'
 		elseif sh_rolan_bazar >= 15:
 			pcs_horny += rand(0,4)
 			'You have become a little bit accustomed to washing yourself in Rolan''s bath and casually you pinch your nipple as if this situation arouses you.'
@@ -265,7 +267,7 @@ if $ARGS[0] = 'start':
 			pcs_horny += rand(0,2)
 			*nl
 			'You try to forget that Rolan''s bathroom door doesn''t latch.'
-			'The idea that the door is open occupies your mind while you are bathing. It would be very embarrassing if Rolan entered at the wrong time.'	
+			'The idea that the door is open occupies your mind while you are bathing. It would be very embarrassing if Rolan entered at the wrong time.'
 			if rand(0,3) = 0:
 				act 'Sing in the shower':
 					cla
@@ -288,14 +290,14 @@ if $ARGS[0] = 'start':
 					'As the jet of warm water begins to caress you, you hear a noise. You call out, "Rolan, is that you?" You don''t hear a response. "Bah! Probably just me being paranoid."'
 					gs 'cum_cleanup'
 !!					gs 'panties', 'linen'
-					if $pantyworntype ! 'none' and rolan_steal_day ! daystart: 
-						gs 'panties', 'dispose' 
+					if $pantyworntype ! 'none' and rolan_steal_day ! daystart:
+						gs 'panties', 'dispose'
 						rolan_panty_day = daystart
 						rolan_panty_count -= 1
 						if rolanpantyQW < 1: rolanpantyQW = 1
-                    end 
-!!					gs 'panties', 'remove' 
-					act 'Finish showering': 
+					end
+!!					gs 'panties', 'remove'
+					act 'Finish showering':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathcold.jpg"></center>'
@@ -309,8 +311,8 @@ if $ARGS[0] = 'start':
 							*nl
 							'You wrap yourself with a towel before exiting the shower, just to be cautious.'
 							act'Quick dressing': gt 'rolanbath','dryOff'
-						end	
-					end	
+						end
+					end
 				end
 			elseif rand(0,3) = 2:
 				act 'Uh..? Is someone there?':
@@ -337,6 +339,7 @@ if $ARGS[0] = 'start':
 								cla
 								*clr
 								minut += 5
+								noShampoo = 1
 								dynamic $showerdin
 								pcs_horny += rand(0,2)
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
@@ -380,11 +383,11 @@ if $ARGS[0] = 'start':
 					'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/bathtub28.mp4"></center>'
 					*nl
 					'You know Rolan isn''t here.'
-					*nl	
+					*nl
 					'He wouldn''t come into the bathroom knowing you were in here.'
 					act 'Rolanbathdryoff': gt $loc, 'start'
-				end	
-			end	
+				end
+			end
 		end
 		dynamic $preshave
 		dynamic $brit
@@ -423,7 +426,7 @@ end
 
 !Bathroom, Rolan caught:
 if $ARGS[0] = 'sexev':
-	if RAND(0,100) < 50: 
+	if RAND(0,100) < 50:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/caught0.jpg"></center>'
 		'...oops... better leave him be.'
@@ -431,7 +434,7 @@ if $ARGS[0] = 'sexev':
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave him alone': gt 'rolanapt','hallway'
-	else 
+	else
 		*clr & cla
 		'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/caught1.mp4"></center>'
 		'...it''s difficult to turn away, but you know you should leave him be.'
@@ -494,7 +497,7 @@ if $ARGS[0] = 'bazar':
 		'<br><<$rolan_imgb_vanna>><br>'
 		'<br><<$rolan_textb_vanna>><br>'
 		'"Sure Miss <<$pcs_lastname>>, tell me!"'
-!		RolanLoc[hour] = 7		
+!		RolanLoc[hour] = 7
 		act 'Chat some more': gt 'rolanbath', 'bazar'
 		if sh_rolan_bazar > 5 and mesec <=0:
 			*clr & cla
@@ -513,7 +516,7 @@ if $ARGS[0] = 'bazar':
 			act 'Ask to take a shower': gt 'rolanbath', 'pervshower'
 			act 'Suggest bathing together': gt 'rolanbath', 'bonershower'
 		end
-	end	
+	end
 	act 'Return to the hallway': gt 'rolanapt','hallway'
 end
 !gg and take a bath when Rolan in bath
@@ -526,6 +529,7 @@ if $ARGS[0] = 'pervshower':
 		cla
 		*clr
 		minut += 15
+		noShampoo = 1
 		dynamic $showerdin
 		if frost > 0:frost = 0
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
@@ -564,7 +568,7 @@ if $ARGS[0] = 'pervshower':
 					gs 'cum_cleanup'
 				end
 				act 'Rolanbathdryoff': gt 'rolanbath','dryOff'
-			end	
+			end
 			act 'Continue washing':
 				cla
 				*clr
@@ -616,7 +620,7 @@ if $ARGS[0] = 'pervshower':
 					act 'Rolanbathdryoff': gt 'rolanbath','dryOff'
 				end
 			end
-		end	
+		end
 		dynamic $preshave
 	end
 end
@@ -625,7 +629,7 @@ end
 if $ARGS[0] = 'bonershower':
 	*clr & cla
 	minut += 5
-	if shampoo > 0: shampoo -= 1
+	noShampoo = 1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 	gs 'stat'
@@ -638,18 +642,18 @@ if $ARGS[0] = 'bonershower':
 	'"I mean, we could both save some time and water if we bathed together!"'
 	*nl
 	'Rolan can only stutter and stammer.'
-	act 'Bra': 
+	act 'Bra':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-        '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanboner0.jpg"></center>'
-        *nl
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanboner0.jpg"></center>'
+		*nl
 		'You try to snap Rolan out of his stupor, "Come on, Rolan, we don''t have all day!"'
 		*nl
 		'Rolan has quickly stripped out of his clothes, while you''ve only managed to get your shirt off.'
 		*nl
 		'"Here, help me with my bra..."'
-		act 'Shoes': 
+		act 'Shoes':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanshoes.jpg"></center>'
 			*nl
@@ -661,7 +665,7 @@ if $ARGS[0] = 'bonershower':
 			pcs_horny += rand(2,4)
 			minut += 5
 			gs 'stat'
-			act 'Bathe together': 
+			act 'Bathe together':
 				*clr & cla
 				pcs_hairbsh = 0
 				pcs_makeup = 1
@@ -673,7 +677,7 @@ if $ARGS[0] = 'bonershower':
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the bath.'
 				pcs_horny += rand(3,6)
 				gs 'stat'
-				act 'Continue': 
+				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanboner3.jpg"></center>'
 					*nl
@@ -686,7 +690,7 @@ if $ARGS[0] = 'bonershower':
 					'You continue to start at his rock hard cock, "And you certainly are <i>healthy</i>."'
 					pcs_horny += rand(3,6)
 					gs 'stat'
-					act 'Continue': 
+					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanhelp.jpg"></center>'
 						*nl
@@ -695,7 +699,7 @@ if $ARGS[0] = 'bonershower':
 						'"Thank you, Rolan, we''re almost done!"'
 						pcs_horny += rand(4,6)
 						gs 'stat'
-						act 'Continue': 
+						act 'Continue':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolancheek.jpg"></center>'
 							'You give Rolan a peck on the cheek, "You see, wasn''t that quicker than a solo bath?"'
@@ -705,7 +709,7 @@ if $ARGS[0] = 'bonershower':
 							act 'Finish': gt 'rolanapt','hallway'
 						end
 					end
-				end	
+				end
 			end
 		end
 	end
@@ -713,11 +717,11 @@ end
 
 !rolanbathdryloc
 if $ARGS[0] = 'dryOff':
-	if RolanLoc[hour] = 0:	
+	if RolanLoc[hour] = 0:
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathtowel'+rand(0,1)+'.jpg"></center>'
-		*nl	
+		*nl
 		'You know Rolan isn''t here.'
 		act 'Get out and dry off': gt $loc, 'start'
 	else
@@ -730,16 +734,17 @@ if $ARGS[0] = 'dryOff':
 				cla
 				*clr
 				minut += 5
+				noShampoo = 1
 				dynamic $showerdin
 				pcs_horny += rand(0,2)
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanbathhide0.jpg"></center>'
 				*nl
 				'It would be very embarrassing if Rolan sees you like this. You''d better wait until he''s done.'
 				act 'wait': gt 'rolanbath','dryOff'
-			end	
-		else		
+			end
+		else
 			cla
-			*clr		
+			*clr
 			'<center><b><font color = maroon>Bathroom</font></b></center>'
 			if newbath ! 1:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathroom.jpg"></center>'
@@ -751,7 +756,7 @@ if $ARGS[0] = 'dryOff':
 			end
 			*nl
 			'Phew! Rolan isn''t here.'
-			act 'Dry off and dress': 
+			act 'Dry off and dress':
 				if rolan_panty_count = 0 and rolan_panty_day = daystart and rolan_steal_count = 0:
 					cla
 					*clr
@@ -765,7 +770,7 @@ if $ARGS[0] = 'dryOff':
 						'"Damn! Rolan really is a panty thief!"'
 					else
 						rolanpantyQW += 1
-					    *nl
+						*nl
 						'"I knew it!"'
 					end
 					act 'Exit': gt $loc, 'start'
@@ -777,7 +782,7 @@ if $ARGS[0] = 'dryOff':
 					*nl
 					'Better hurry and dry off. You never know...'
 					act 'exit': gt $loc, 'start'
-				end	
+				end
 			end
 		end
 	end
@@ -791,19 +796,19 @@ if $ARGS[0] = 'tools':
 		workertool += 1
 		gs 'stat'
 		'<center><h4><font color="maroon">Tools</font></h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garages.jpg"></center>'
 		'You quickly run to your stepfather''s garage to grab some tools. Rolan said he already has the paint so you won''t need to bring that. You start to rummaging in search of the tools.'
 		'You spend several minutes gathering the appropriate tools from your stepfather''s garage. However, you are unable to find any concrete mix. Perhaps Rolan has some back at the apartment.'
 		act 'Back to Rolan''s':
-		    cla
+			cla
 			*clr
 			minut += 10
 			'<center><b><font color = maroon>Tools</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/bathchat/builder/worker0.jpg"></center>'
 			'You search the apartment from top to bottom but don''t find any concrete mix. The only room left is...'
 			act 'Only one room left...': gt 'rolanapt','grandmaroom'
-		end	
-    end
+		end
+	end
 end
 
 if $ARGS[0] = 'surprise':
@@ -813,7 +818,7 @@ if $ARGS[0] = 'surprise':
 	rolanworker += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Surprise</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanwelcome.jpg"></center>'		
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/rolanwelcome.jpg"></center>'
 	'"Hi, Rolan! What do you think of your new bathroom?"'
 	*nl
 	'"Miss <<$pcs_lastname>>... I-I am speechless..."'
@@ -856,9 +861,9 @@ if $ARGS[0] = 'surprise':
 				'"No, I didn''t get the concrete from my stepfather," You raise an eyebrow, "I found that container of concrete powder in that one bedroom you actually keep clean."'
 				*nl
 				'Without saying another word, Rolan runs out of the room...'
-				act 'follow Rolan': gt 'rolanapt','hallway'		
-			end	
-		end	
+				act 'follow Rolan': gt 'rolanapt','hallway'
+			end
+		end
 	end
 end
 

+ 48 - 12
locations/sauna.qsrc

@@ -96,17 +96,23 @@ if $ARGS[0] = 'saunaroom':
 	gs 'kit_din'
 	'<center><b><font color="maroon">Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/saunaroom.jpg"></center>'
-
+	*nl
 	'<br>The room has a thread bare <a href="exec:sec += 30 & gt ''bed2''">bed</a> and a cheap <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	*nl
 
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
+	*nl
 
 	if budilnikOn = 0:
 		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & gt ''sauna'', ''saunaroom''">off</a>.'
+		*nl
 	else
 		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & gt ''sauna'', ''saunaroom''">on</a>.'
+		*nl
 	end
 
+	'If you run out of personal hygeine or beauty products, you can ask for some more, but at a cost.'
+	*nl
 	gs 'saunawhore','debtPay'
 	if workDolg > 0:'Your debt is <<workDolg>> <b>₽</b>'
 
@@ -115,27 +121,57 @@ if $ARGS[0] = 'saunaroom':
 	if workDolg > 0:
 		act 'Have some food (0:15)':
 			gs 'food', 'm_meal'
-			workDolg += 100
+			workDolg += 200
 		end
-		
+
 		act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
-		
-		act 'Borrow cosmetics':
-			workDolg += 1000
-			kosmetica += 25
-			gt 'sauna', 'saunaroom'
+
+		if kosmetica = 0:
+			act 'Ask for some cosmetics':
+				workDolg += 1200
+				kosmetica += 20
+				gt 'sauna', 'saunaroom'
+			end
+		end
+		if shampoo = 0:
+			act 'Ask for some shampoo':
+				workDolg += 400
+				shampoo += 20
+				gt 'sauna', 'saunaroom'
+			end
+		end
+		if stanok = 0:
+			act 'Ask for some razors':
+				workDolg += 700
+				stanok += 20
+				gt 'sauna', 'saunaroom'
+			end
+		end
+		if tampon = 0:
+			act 'Ask for some tampons':
+				workDolg += 400
+				tampon += 20
+				gt 'sauna', 'saunaroom'
+			end
+		end
+		if deodorant = 0:
+			act 'Ask for some deodorant':
+				workDolg += 200
+				deodorant += 20
+				gt 'sauna', 'saunaroom'
+			end
 		end
 	end
-	
+
 	if workDolg <= 0 and SaunaWhore > 0:
 
-		if money >= 100:
+		if money >= 200:
 			act 'Buy some food (0:15) (100 <b>₽</b>)':
 				gs 'food', 'm_meal'
-				money -= 100
+				money -= 200
 			end
 		end
-		
+
 		act 'Drink some water (0:05)': gs 'beverage', 'bev_wat'
 
 		dynamic $fatdel

+ 7 - 25
locations/saunawhore.qsrc

@@ -1061,42 +1061,24 @@ if $ARGS[0] = 'bathroom':
 		dynamic $dryOff
 	end
 
-	if workDolg > 0:
+	if workDolg > 0 and stanok > 0:
 		*nl
-		'There are a handful of cheap razors you can use, enough for <<stanok>> shaves. At least they don''t make you pay for them, but only because they don''t know who has used which blades. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
-		if stanok < 5: stanok = 5
+		'You have a handful of cheap razors you can use, enough for <<stanok>> shaves. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
+	elseif workDolg > 0 and stanok = 0:
+		*nl
+		'You have <<stanok>> razors left. You should go to your room and ask for more razors.'
 	elseif workDolg <= 0 and stanok > 0:
 		*nl
 		'Your current pack of razors will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 		dynamic $brit
 	elseif workDolg = 0 and stanok = 0:
 		*nl
-		'You have <<stanok>> razors left. You should to go to the store and buy more razors. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
+		'You have <<stanok>> razors left. You should to go to the store and buy more razors.'
 	end
 	gs 'din_van', 'prvt_pee'
 	dynamic $enema
-
-	if workdolg > 0:
-		if (mesec > 0 or (placebopart > 2 and pillcon < 40000)) and isprok = 0 and isprokp = 0:
-			act 'Buy and use a tampon (0:05)':
-				cla
-				*clr
-				isprok = 1
-				minut += 5
-				pcs_mood -= 5
-				workDolg += 10
-
-				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/wash3.jpg"></center>'
-				'You use a tampon, it will add another 10 <b>₽</b> to your debt, but the alternative is unpleasant.'
-
-				act 'Finish':gt $locM, $metkaM
-			end
-		end
-	elseif workdolg = 0:
-		dynamic $tampon
-	end
-
+	dynamic $tampon
 	dynamic $quickwash
 	dynamic $bteeth
 	dynamic $basin

+ 1 - 0
locations/shulgabath.qsrc

@@ -217,6 +217,7 @@ if $ARGS[0] = 'lesb':
 	npc_sex['A25'] += 1
 	pcs_hairbsh = 0
 	pcs_makeup = 1
+	noShampoo = 1
 	dynamic $showerdin
 	if frost > 0:frost = 0
 	gs 'stat'

+ 1 - 0
locations/swamphouse.qsrc

@@ -449,6 +449,7 @@ if $ARGS[0] = 'tub':
 		act 'Bathe in the tub (0:30)':
 			cla
 			*clr
+			noShampoo = 1
 			dynamic $showerdin
 			face_write = 0
 			body_write = 0

+ 1 - 0
locations/vanrPar.qsrc

@@ -158,6 +158,7 @@ if $ARGS[0] = 'stepdad_sex_end':
 
 	act 'Wash again':
 		minut += 15
+		noShampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		gt 'vanrPar'

+ 9 - 4
locations/yarik.qsrc

@@ -203,8 +203,9 @@ if $ARGS[0] = '4':
 				'You are caught off guard by your arousal and have a surprising, but pleasing orgasm.'
 			end
 
-			act 'Shower':
+			act 'Take a shower':
 				minut += 15
+				noShampoo = 1
 				dynamic $showerdin
 				money += 2250
 				gt 'yarik', 'end'
@@ -264,8 +265,9 @@ if $ARGS[0] = '5':
 						'You don''t realise how aroused you have gotten until you moan in orgasm.'
 					end
 
-					act 'Shower':
+					act 'Take a shower':
 						minut += 15
+						noShampoo = 1
 						dynamic $showerdin
 						money += 2500
 						gt 'yarik', 'end'
@@ -345,8 +347,9 @@ if $ARGS[0] = '6':
 									'You enjoy a fulfilling orgasm.'
 								end
 
-								act 'Shower':
+								act 'Take a shower':
 									minut += 15
+									noShampoo = 1
 									dynamic $showerdin
 									money += 3000
 									gt 'yarik', 'end'
@@ -415,8 +418,9 @@ if $ARGS[0] = '7':
 							'You have a powerful orgasm.'
 						end
 
-						act 'Shower':
+						act 'Take a shower':
 							minut += 15
+							noShampoo = 1
 							dynamic $showerdin
 							money += 3500
 							gt 'yarik', 'end'
@@ -431,6 +435,7 @@ end
 if $ARGS[0] = 'end':
 	cls
 	pcs_hairbsh = 0
+	noShampoo = 1
 	dynamic $showerdin
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/yaroslav/sex/1365154231_studentka-ischet-rabotu-28.jpg" width = 750 height = 450 ></center>'

+ 1 - 0
locations/yban.qsrc

@@ -18,6 +18,7 @@ if saunaday ! daystart:
 		minut += 60
 		fat -= 10
 		pcs_sweat = rand(0,5)
+		noShampoo = 1
 		dynamic $showerdin
 		saunaday = daystart
 		pcs_mood = 100

+ 1 - 0
locations/youry.qsrc

@@ -195,6 +195,7 @@ if $ARGS[0] = 'quest':
 													cla
 													*clr
 													minut += 15
+													noShampoo = 1
 													dynamic $showerdin
 													pcs_horny += 1
 													pcs_hairbsh = 1

Some files were not shown because too many files changed in this diff