1
0
Просмотр исходного кода

Merge remote-tracking branch 'Expurt/master'

Kevin_Smarts 1 год назад
Родитель
Сommit
36fd85092e

+ 115 - 115
locations/booty_call_favorite_part.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'creampie_favorite':
 		'"What about you?" he asks. "What about you? What was your favorite part?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'I liked it too':
 		cla & *nl
 		if booty_call['creampie_count'] = booty_call['simultaneous_orgasm_count']:
@@ -75,7 +75,7 @@ if $ARGS[0] = 'creampie_favorite':
 		end
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	if booty_call['surprise_creampie_count'] >= 3:
 		'"Your pussy is amazing," <<$npc_firstname[$boy]>> says. "It''s like you were sucking me in, I couldn''t stop coming inside you."'
 		if npc_free_creampies[$boy] < 1:
@@ -84,8 +84,8 @@ if $ARGS[0] = 'creampie_favorite':
 				'"It would be nice if you would ask before you do," you smile teasingly. "I''m not just a cum receptacle you know."'
 				'"Sorry," he replies, though he doesn''t look it. "What about you? What was your favorite part?"'
 				gs'booty_call_favorite_part', 'pc_favorite_part'
-			end	
-			
+			end
+
 			act'Ask next time (annoyed)':
 				cla
 				'"It would be nice if you would ask first," you frown in annoyance. "I''m not just a cum receptacle you know."'
@@ -117,14 +117,14 @@ if $ARGS[0] = 'cum_mouth_favorite':
 			'"So what about you? What did you like?"'
 			gs'booty_call_favorite_part', 'pc_favorite_part'
 		end
-		
+
 		act'Not my favorite':
 			cla & *nl
 			'"It''s not exactly my favorite flavour of syrup," you smile ruefully. "But I''m glad you thought it was hot."'
 			'"So what about you? What did you like?"'
 			gs'booty_call_favorite_part', 'pc_favorite_part'
 		end
-		
+
 		if npc_tasty_cum[$boy] ! 1:
 			act'Your cum is disgusting':
 				npc_gross_cum[$boy] = 1
@@ -143,7 +143,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 						'"Yes, it can be and it is," you say, making a face at him. "I <i>wish</i> was making this up. Yuck!"'
 						gs'booty_call_pillow_talk', 'topics'
 					end
-					
+
 					act'Maybe exaggerating':
 						npc_rel[$boy] += 1
 						cla & *clr
@@ -152,7 +152,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 						'You give him an apologetic smile which he seems to accept when he smiles back.'
 						gs'booty_call_pillow_talk', 'topics'
 					end
-					
+
 					act'Get sarcastic':
 						npc_rel[$boy] -= 1
 						cla & *clr
@@ -171,7 +171,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 							'"Well what about you? Was there something I did to make you feel good?"'
 							gs'booty_call_favorite_part', 'pc_favorite_part'
 						end
-						
+
 						act'For you (sarcastic)':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 							'"Well what about you? Was there something I did to make you feel good?"'
 							gs'booty_call_favorite_part', 'pc_favorite_part'
 						end
-						
+
 						act'Acquiring taste':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -189,7 +189,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 							'"Well I appreciate the effort. What about you? Was there something I did to make you feel good?"'
 							gs'booty_call_favorite_part', 'pc_favorite_part'
 						end
-						
+
 						act'Spitting is quitting':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 				end
 			end
 		end
-		
+
 		if npc_gross_cum[$boy] ! 1:
 			act'You''re delicious':
 				npc_tasty_cum[$boy] = 1
@@ -220,7 +220,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
 		end
-		
+
 		if pcs_traits['cumeater'] > 0:
 			act'I love cum':
 				cla & *nl
@@ -239,14 +239,14 @@ if $ARGS[0] = 'cum_mouth_favorite':
 			'"Then what <i>do</i> you like?"'
 			gs'booty_call_favorite_part', 'pc_favorite_part'
 		end
-		
+
 		act'It''s gross':
 			cla & *nl
 			'"Cum is gross," you say, wrinkling your nose. "I hate it. There''s no way I''m swallowing that vile shit."'
 			'"Then what <i>do</i> you like?"'
 			gs'booty_call_favorite_part', 'pc_favorite_part'
 		end
-		
+
 		act'Don''t like you enough':
 			cla & *nl
 			'"I don''t like you enough for that yet," you say.'
@@ -262,14 +262,14 @@ if $ARGS[0] = 'cum_mouth_favorite':
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
 			end
-			
+
 			act'Maybe':
 				cla & *nl
 				'"Maybe," you smirk teasingly.'
 				'"Okay, I see how it is," <<$npc_firstname[$boy]>> chuckles. "So what did <i>you</i> enjoy then? So I know what to do to make you like me?"'
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
-			
+
 			act'Yes':
 				cla & *nl
 				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
 		end
-		
+
 		act'Only for boyfriends':
 			cla & *nl
 			'"I only swallow for my boyfriend," you say.'
@@ -294,7 +294,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
 			end
-			
+
 			act'Maybe':
 				cla & *nl
 				'"Maybe," you smirk teasingly.'
@@ -306,7 +306,7 @@ if $ARGS[0] = 'cum_mouth_favorite':
 				!! insert option for "are you being serious?"
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
-			
+
 			act'Yes':
 				cla & *nl
 				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
@@ -342,7 +342,7 @@ if $ARGS[0] = 'facial_favorite':
 		'"What about you?" he asks. "What about you? What was your favorite part?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'Why?':
 		cla & *nl
 		if cum_loc['face'] > 0:
@@ -353,7 +353,7 @@ if $ARGS[0] = 'facial_favorite':
 		'"I don''t know," he shrugs. "There''s just something... primal about it. It''s hot, what else do you want me to say? But what about you? What was your favorite part?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	if booty_call['disgusting_facial'] = 0:
 		act'I liked it too':
 			cla & *nl
@@ -364,7 +364,7 @@ if $ARGS[0] = 'facial_favorite':
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'It feels nice':
 			cla & *nl
 			if cum_loc['face'] > 0:
@@ -389,7 +389,7 @@ if $ARGS[0] = 'facial_favorite':
 				'"Well, what do you enjoy then?" <<$npc_firstname[$boy]>> asks.'
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
-			
+
 			act'Cause you like it':
 				cla
 				act'(Affectionate)':
@@ -398,7 +398,7 @@ if $ARGS[0] = 'facial_favorite':
 					'"Well, what can I do to turn you on then?" <<$npc_firstname[$boy]>> asks.'
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
-				
+
 				act'(Sarcastic)':
 					cla & *nl
 					'"Cause I know you''re a pervert," you say eyeballing him. "And pervs like seeing girls get facials."'
@@ -406,17 +406,17 @@ if $ARGS[0] = 'facial_favorite':
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
 			end
-			
+
 			act'You didn''t ask':
 				cla & *nl
 				'"Cause you didn''t ask!" you scowl. "Only thing I knew was that you pulled out and before I could say anything you''re blowing your load on my face."'
 				if npc_argumentative[$boy] = 1 or npc_insecure[$boy] = 1:
-					
+
 				else
-					
+
 				end
 			end
-			
+
 			act'I don''t get a say (subservient)':
 				cla & *nl
 				'"Cause it''s not up to me," you shrug. "Sex is about making the guy feel good. I''m the girl you''re fucking. If you want to come on my face, who am I to stop you?"'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 	else
 		'"I love coming all over your tits," <<$npc_firstname[$boy]>> grins. "You look so sexy like that."'
 	end
-	
+
 	act'Glad you enjoyed it':
 		cla & *nl
 		if cum_loc['tits'] > 0:
@@ -453,7 +453,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 		'"What about you?" he asks. "What about you? What was your favorite part?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'Why?':
 		cla & *nl
 		if cum_loc['tits'] > 0:
@@ -464,7 +464,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 		'"Tits are sexy, girls with cum on them are sexy," he shrugs. "So tits with cum on them are the sexiest. What''s not to love about it? But what about you? What was your favorite part?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	if booty_call['tit_cum_gross'] = 0:
 		act'I liked it too':
 			cla & *nl
@@ -475,7 +475,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'It feels nice':
 			cla & *nl
 			if cum_loc['tits'] > 0:
@@ -500,7 +500,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 				'"Well, what do you enjoy then?" <<$npc_firstname[$boy]>> asks.'
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
-			
+
 			act'Cause you like it':
 				cla
 				act'(Affectionate)':
@@ -509,7 +509,7 @@ if $ARGS[0] = 'tit_cum_favorite':
 					'"Well, what can I do to turn you on then?" <<$npc_firstname[$boy]>> asks.'
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
-				
+
 				act'(Sarcastic)':
 					cla & *nl
 					'"Cause I know you''re a pervert," you say eyeballing him. "And pervs like seeing girls get slimed."'
@@ -517,17 +517,17 @@ if $ARGS[0] = 'tit_cum_favorite':
 					gs'booty_call_favorite_part', 'pc_favorite_part'
 				end
 			end
-			
+
 			act'You didn''t ask':
 				cla & *nl
 				'"Cause you didn''t ask!" you scowl. "Only thing I knew was that you pulled out and before I could say anything you''re blowing your load all over my chest!"'
 				if npc_argumentative[$boy] = 1 or npc_insecure[$boy] = 1:
-					
+
 				else
-					
+
 				end
 			end
-			
+
 			act'I don''t get a say (subservient)':
 				cla & *nl
 				'"Cause it''s not up to me," you shrug. "Sex is about making the guy feel good. I''m the girl you''re fucking. If you want to come on my tits, who am I to stop you?"'
@@ -555,7 +555,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 		'"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'What do you like about eating pussy?':
 		cla & *nl
 		'"Why do you like eating pussy so much?" you giggle. "You''re not gonna come from it."'
@@ -572,7 +572,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 				'"What can I say? I just think it''s fun. What about you? What do you like?"'
 				gs'booty_call_favorite_part', 'pc_favorite_part'
 			end
-			
+
 			act'Yes':
 				cla & *nl
 				'"... yeah," you admit.'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 					'"Guess you''ve got a point," you chuckle.'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'The taste':
 					cla & *nl
 					'"Something about having a cock in my mouth just feels good," you say. "The sweaty rough texture, the sort of musky smell. It''s like licking a warm salty popsicle."'
@@ -592,7 +592,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 					'"Guess you''ve got a point," you chuckle.'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'The control':
 					cla & *nl
 					'"I guess because of the control?" you say. "There''s something... empowering about having a cock in my mouth. Like I could just chomp down and cause tons of pain but also that I have a direct line to the pleasure a guy is feeling. <i>I</i> get to decide if he gets to feel good. <i>I</i> get to decide if he gets to come. I can edge him, I can tease him, I can swallow him whole, make him gasp. Something about that just... turns me on."'
@@ -604,14 +604,14 @@ if $ARGS[0] = 'pussyeat_favorite':
 			gs'booty_call_favorite_part', 'pc_favorite_part'
 		end
 	end
-	
+
 	act'What do I taste like?':
 		cla & *nl
 		'"Yeah?" you smirk back. "What do I taste like?"'
 		'"Hmm... A little salty. Maybe a little sweet too. Not exactly sure how to describe it other than to say you taste delicious. Did you enjoy it too?"'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'You''re really good at it':
 		cla & *nl
 		'"Did I mention that you''re really good at that?" you smile.'
@@ -621,7 +621,7 @@ if $ARGS[0] = 'pussyeat_favorite':
 			'"You didn''t have to," he smirks back. "I could tell by the way you were screaming my name."'
 		end
 	end
-	
+
 	gs'booty_call_pillow_talk', 'kuni_wear_out'
 end
 
@@ -636,7 +636,7 @@ if $ARGS[0] = 'npc_miss_fav1':
 			'"Me too," you smile back. "There''s just something... pleasant about missionary. Can''t explain it but it''s my favorite way to fuck."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'It''s intimate':
 			cla & *nl
 			if booty_call['creampie_count'] > 0 and (booty_call['creampie_allowance'] > 0 or npc_free_creampies[$boy] > 0):
@@ -646,21 +646,21 @@ if $ARGS[0] = 'npc_miss_fav1':
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Like being on bottom':
 			cla & *nl
 			'"Me too," you smile back. "I prefer being on bottom myself."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
-	
+
 	act'It''s not my favorite (liked)':
 		cla & *nl
 		'"Yeah?" you say. "Missionary isn''t usually my favorite, but I had fun while we were doing it."'
 		'"Then what <i>is</i> your favorite?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'It''s not my favorite (disliked)':
 		cla & *nl
 		'"At least you were having fun," you say wryly. "Missionary isn''t really my cup of tea."'
@@ -668,7 +668,7 @@ if $ARGS[0] = 'npc_miss_fav1':
 		'"Then what do you prefer?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'Isn''t missionary boring?':
 		npc_rel[$boy] -= 1
 		cla & *clr
@@ -696,27 +696,27 @@ if $ARGS[0] = 'npc_doggy_fav1':
 			'"Me too," you grin back. "It feels better in doggy. Hits the inside of my pussy just right."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Goes deeper':
 			cla & *nl
 			'"Me too," you grin back. "I can feel you so much deeper inside when you fuck me doggy."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Feels dirty':
 			cla & *nl
 			'"Me too," you grin back wickedly. "It feels dirty. And I like it dirty."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
-	
+
 	act'It''s not my favorite (liked)':
 		cla & *nl
 		'"Yeah?" you say. "Doggystyle isn''t usually my favorite, but I had fun while we were doing it."'
 		'"Then what <i>is</i> your favorite?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'It''s not my favorite (disliked)':
 		cla & *nl
 		'"At least you were having fun," you say wryly. "Doggystyle isn''t really my cup of tea."'
@@ -724,7 +724,7 @@ if $ARGS[0] = 'npc_doggy_fav1':
 		'"Then what do you prefer?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'Isn''t doggy boring?':
 		npc_rel[$boy] -= 1
 		cla & *clr
@@ -756,27 +756,27 @@ if $ARGS[0] = 'npc_cowgirl_fav1':
 			'"Me too," you grin back. "I love bouncing on your dick! I can''t get that feeling in any other position."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Good angle':
 			cla & *nl
 			'"Me too," you grin back. "Your cock rubs against the inside of my pussy in a whole different way. I can only get that when I''m on top."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Like control':
 			cla & *nl
 			'"Me too," you grin back wickedly. "I like being in charge."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
-	
+
 	act'It''s not my favorite (liked)':
 		cla & *nl
 		'"Yeah?" you say. "Cowgirl isn''t usually my favorite, but it was fun bouncing on your dick."'
 		'"Then what <i>is</i> your favorite?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'It''s not my favorite (disliked)':
 		cla & *nl
 		'"At least you were having fun," you say wryly. "Cowgirl isn''t really my cup of tea."'
@@ -784,7 +784,7 @@ if $ARGS[0] = 'npc_cowgirl_fav1':
 		'"Then what do you prefer?" he asks in response.'
 		gs'booty_call_favorite_part', 'pc_favorite_part'
 	end
-	
+
 	act'Cowgirl sucks':
 		npc_rel[$boy] -= 1
 		cla & *clr
@@ -810,7 +810,7 @@ if $ARGS[0] = 'npc_argue_lashout':
 		'A spike of anger jolts through you and your body stiffens for a fight by instinct. But you take a deep breath through your nose and turn your head, choosing not to pursue conflict and just let it go instead.'
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	act'Apologize':
 		npc_rel[$boy] += 1
 		cla & *clr
@@ -824,7 +824,7 @@ end
 
 if $ARGS[0] = 'npc_bj_fav1':
 	$booty_call['boy_favorite'] = 'blowjob'
-	
+
 end
 
 if $ARGS[0] = 'pc_favorite_part':
@@ -847,7 +847,7 @@ if $ARGS[0] = 'pc_favorite_part':
 			'You smile warmly at him.'
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Everything together':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -864,7 +864,7 @@ if $ARGS[0] = 'pc_favorite_part':
 	gs'booty_call_favorite_part', 'pc_mouthcum_fav1'
 	gs'booty_call_favorite_part', 'pc_facial_fav1'
 	gs'booty_call_favorite_part', 'pc_titcum_fav1'
-	
+
 end
 
 if $ARGS[0] = 'pc_bj_fav1':
@@ -885,7 +885,7 @@ if $ARGS[0] = 'pc_bj_fav1':
 				gs'booty_call_favorite_part', 'pc_bj_fav2'
 				gs'booty_call_favorite_part', 'pc_bj_fav3'
 			end
-			
+
 			act'Oral fixation':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -893,7 +893,7 @@ if $ARGS[0] = 'pc_bj_fav1':
 				'"Oral fixation huh?" <<$npc_firstname[$boy]>> says, running his thumb across your lips.'
 				gs'booty_call_favorite_part', 'pc_bj_fav3'
 			end
-			
+
 			act'The taste':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -942,7 +942,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 					'"You made for a memorable first fuck."'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'Wish I hadn''t waited':
 					cla & *nl
 					'"Makes me wish I hadn''t waited so long," you sigh. "I would have fucked a guy ages ago if I knew it felt this good!'
@@ -960,13 +960,13 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							'"Hmmm... It''s not usually my favorite," you shrug. "But something about it was nice this time."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'It''s pleasant':
 							cla & *nl
 							'"There''s just something... pleasant about it," you say. "I like having you between my legs."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'It''s intimate':
 							cla & *nl
 							if booty_call['creampie_count'] > 0 and (booty_call['creampie_allowance'] > 0 or npc_free_creampies[$boy] > 0):
@@ -976,7 +976,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							end
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Like being on bottom':
 							cla & *nl
 							'"I just like it when the guy''s on top," you grin. "Being on bottom is more fun."'
@@ -984,7 +984,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 						end
 					end
 				end
-				
+
 				if booty_call['doggy_fuck'] = 1:
 					act'When we did it doggy':
 						cla & *clr
@@ -996,19 +996,19 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							'"Hmmm... It''s not <i>usually</i> my favorite," you shrug. "But it was good this time. Nice to mix things up."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels better':
 							cla & *nl
 							'"Hell yes," you grin. "It feels so much better when you fuck me from behind."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Goes deeper':
 							cla & *nl
 							'"Hell yes," you grin. "Don''t you know? Your cock goes deeper in doggy."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels dirty':
 							cla & *nl
 							'"It feels dirty," you grin wickedly. "And I like it dirty."'
@@ -1029,19 +1029,19 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							'"Hmmm... It''s not <i>usually</i> my favorite," you shrug. "But who doesn''t like a good ride now and then?"'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels better':
 							cla & *nl
 							'"I love bouncing on dick!" you say. "I can''t get that feeling in any other position."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Good angle':
 							cla & *nl
 							'"The angle''s better," you grin. "Rubs against the inside of my pussy in a whole different way."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Like the control':
 							cla & *nl
 							'"I like being in charge," you smirk.'
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 						gs'booty_call_pillow_talk', 'topics'
 					end
 				end
-				
+
 				if booty_call['rough_enjoy'] = 1:
 					act'When you fucked me hard':
 						booty_call['rough_pillow_talk'] = 1
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							'"Not always," you shrug. "But any one speed is boring if you don''t mix it up. A good pounding is always welcome provided the timing is right."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Admit it':
 							npc_knows_pc_likes_rough[$boy] = 1
 							cla & *nl
@@ -1078,7 +1078,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							gs'booty_call_pillow_talk', 'topics'
 						end
 					end
-					
+
 					if booty_call['rough_fuck'] = 1:
 						act'When you got rough with me':
 							booty_call['rough_pillow_talk'] = 1
@@ -1091,21 +1091,21 @@ if $ARGS[0] = 'pc_fuck_fav1':
 								'"Not always," you shrug. "But what girl doesn''t like to get rough housed now and again?"'
 								gs'booty_call_pillow_talk', 'topics'
 							end
-							
+
 							act'Admit it':
 								npc_knows_pc_likes_rough[$boy] = 1
 								cla & *nl
 								'"I love it when guys get rough with me," you admit freely. "There''s something so sexy about it, something so intense, so <i>primal</i>. And I love the exhausted feeling that comes after like we just fucked each other''s brains out."'
 								gs'booty_call_pillow_talk', 'topics'
 							end
-							
+
 							act'Liked the pain':
 								npc_knows_pc_likes_rough[$boy] = 1
 								cla & *nl
 								'"I love it when guys get rough with me," you admit freely. "I kind of hurts, but in like a good way. There''s something so sexy about it, something so intense, so <i>primal</i>. And I love the exhausted feeling that comes after like we just fucked each other''s brains out."'
 								gs'booty_call_pillow_talk', 'topics'
 							end
-							
+
 							act'Sub':
 								npc_knows_pc_likes_rough[$boy] = 1
 								cla & *nl
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'pc_fuck_fav1':
 							end
 						end
 					end
-					
+
 					if npc_knows_pc_likes_rough[$boy] = 1:
 						act'The usual pounding':
 							npc_knows_pc_likes_rough[$boy] = 1
@@ -1142,7 +1142,7 @@ if $ARGS[0] = 'pc_fuck_fav2':
 					'<i>Oh my! How embarrassing!</i>'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'Wish I hadn''t waited':
 					cla & *nl
 					'"Makes me wish I hadn''t waited so long," you smile shyly, feeling your blush intensify. "I didn''t know sex felt this good."'
@@ -1160,19 +1160,19 @@ if $ARGS[0] = 'pc_fuck_fav2':
 							'"Not usually my favorite," you stammer. "But something about it was nice this time."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'It''s pleasant':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify, managing to stammer out, "I-it''s pleasant..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'It''s intimate':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify, managing to stammer out, "I-it''s kind of intimate... I like that about it..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Like being on bottom':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "I like... I like it when the guy is on top..."'
@@ -1180,7 +1180,7 @@ if $ARGS[0] = 'pc_fuck_fav2':
 						end
 					end
 				end
-				
+
 				if booty_call['doggy_fuck'] = 1:
 					act'When we did it doggy':
 						cla & *clr
@@ -1192,19 +1192,19 @@ if $ARGS[0] = 'pc_fuck_fav2':
 							'"Not usually my favorite," you stammer. "But something about it was nice this time."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels better':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "It... feels better from behind..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Goes deeper':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "It goes... deeper... from behind..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels dirty':
 							cla & *nl
 							'"Y-yes," you admit. "I kind of like how, uhm... <i>dirty</i>... it feels..."'
@@ -1224,19 +1224,19 @@ if $ARGS[0] = 'pc_fuck_fav2':
 							'"Not usually my favorite," you stammer. "But something about it was nice this time."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Feels better':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "It... feels better when I''m on top..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Good angle':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "It hits, uh... different part, when I''m on top..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Like the control':
 							cla & *nl
 							'"Y-yes," you admit. "I kind of like how I''m, uhm... in control..."'
@@ -1252,7 +1252,7 @@ if $ARGS[0] = 'pc_fuck_fav2':
 						gs'booty_call_pillow_talk', 'topics'
 					end
 				end
-				
+
 				if booty_call['rough_enjoy'] = 1:
 					act'When you fucked me hard':
 						booty_call['rough_pillow_talk'] = 1
@@ -1265,14 +1265,14 @@ if $ARGS[0] = 'pc_fuck_fav2':
 							'"Not a-always," you stammer. "But it''s nice now and again..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
-						
+
 						act'Admit it':
 							cla & *nl
 							'"Y-yes," you admit, feeling your blush intensify. "It... feels good..."'
 							gs'booty_call_pillow_talk', 'topics'
 						end
 					end
-					
+
 					if booty_call['rough_fuck'] = 1:
 						act'When you got rough with me':
 							booty_call['rough_pillow_talk'] = 1
@@ -1285,13 +1285,13 @@ if $ARGS[0] = 'pc_fuck_fav2':
 								'"Not a-always," you stammer. "But the variety was nice..."'
 								gs'booty_call_pillow_talk', 'topics'
 							end
-							
+
 							act'Admit it':
 								cla & *nl
 								'"Y-yes," you admit, feeling your blush intensify. "It... felt good... getting manhandled by you..."'
 								gs'booty_call_pillow_talk', 'topics'
 							end
-							
+
 							act'Liked the pain':
 								cla & *nl
 								'"Y-yes," you admit, feeling your blush intensify. "It hurt but... the hurt felt good..."'
@@ -1371,7 +1371,7 @@ if $ARGS[0] = 'pc_creampie_fav1':
 					'"I liked it when you came inside me," you smile warmly at <<$npc_firstname[$boy]>> rubbing your wet thighs together where his cum was leaking from your snatch just minutes ago. "I can <i>feel</i> everything. Your cock throbs inside me, warmth spreading through my hips, I just feel <i>full</i> when you come inside me. And it feels really really good."'
 				end
 			end
-			if booty_call['accidental_creampie_convo'] = 0 and (npc_know_not_bc[$boy] = 1 or booty_call['risky_creampie'] > 0 or npc_childfree[$boy] > 0) and :
+			if booty_call['accidental_creampie_convo'] = 0 and (npc_know_not_bc[$boy] = 1 or booty_call['risky_creampie'] > 0 or npc_childfree[$boy] > 0):
 				gs'booty_call_pillow_talk', 'boy_accidental_creampie'
 			else
 				gs'booty_call_pillow_talk', 'topics'
@@ -1417,13 +1417,13 @@ if $ARGS[0] = 'pc_mouthcum_fav1':
 						'"Just... doing it I guess?" you say with a shy smile. "There''s just something... <i>hot</i> about swallowing a guys''s load. I don''t really get it myself if I''m being honest. All I know is that it turns me on."'
 						gs'booty_call_pillow_talk', 'topics'
 					end
-					
+
 					act'The look on your face':
 						cla & *nl
 						'"The look on your face," you grin devilishly at him. "You have no idea but guy''s faces just <i>light up</i> when you swallow their cum. There''s something so funny about it. And so arousing..."'
 						gs'booty_call_pillow_talk', 'topics'
 					end
-					
+
 					act'The taste':
 						cla & *nl
 						'"I just like the taste," you grin. "Besides, it''s already in my mouth. Feels like a waste if I spit it out. Might as well get some protein in my diet."'
@@ -1477,25 +1477,25 @@ if $ARGS[0] = 'good_for_you_too':
 		'"I had fun," you say, smiling at <<$npc_firstname[$boy]>>.'
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	if booty_call['fuck_count'] > 0:
 		act'Good dicking':
 			cla & *nl
-			if  booty_call['orgasm_count'] > 0:
+			if	booty_call['orgasm_count'] > 0:
 				'"You dicked me real good," you grin back. "Plus you made me come. So that''s worth something all on its own."'
 			else
 				'"You dicked me real good," you grin back. "That''s enough for me."'
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
+
 		act'Dick drunk':
 			cla & *nl
 			'"I think I''m dick drunk," you say with a ditzy giggle, rubbing your wet thighs together.'
 			gs'booty_call_pillow_talk', 'topics'
-		end		
+		end
 	end
-	
+
 	if booty_call['fuck_count'] >= 5:
 		act'Won''t walk right':
 			cla
@@ -1510,7 +1510,7 @@ if $ARGS[0] = 'good_for_you_too':
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end
-		
+
 			act'(in a bad way)':
 				cla & *nl
 				booty_call['keep_it_up'] = 1
@@ -1541,7 +1541,7 @@ if $ARGS[0] = 'good_for_you_too':
 				'You both grin at that.'
 				gs'booty_call_pillow_talk', 'topics'
 			end
-		
+
 			act'(in a bad way)':
 				booty_call['sore_pussy_talk'] = 1
 				cla & *nl
@@ -1550,7 +1550,7 @@ if $ARGS[0] = 'good_for_you_too':
 			end
 		end
 	end
-	
+
 	if booty_call['orgasm_count'] + booty_call['fake_orgasm_count'] > 3:
 		act'Lots of orgasms':
 			cla & *nl
@@ -1564,7 +1564,7 @@ if $ARGS[0] = 'good_for_you_too':
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
-	
+
 	if booty_call['cum_count'] = npc_sexdrive[$boy]:
 		act'Could''ve gone more rounds':
 			cla & *nl
@@ -1576,7 +1576,7 @@ if $ARGS[0] = 'good_for_you_too':
 				'"That''s okay," you giggle. "I forgive you."'
 				gs'booty_call_pillow_talk', 'topics'
 			end
-			
+
 			act'Roll your eyes':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
@@ -1586,7 +1586,7 @@ if $ARGS[0] = 'good_for_you_too':
 			end
 		end
 	end
-	
+
 	if booty_call['creampie_count'] >= 4 and cum_loc['vagina'] > 0:
 		act'I''m full (of cum)':
 			gs'booty_call_pillow_talk', 'talk_time_add'

+ 11 - 11
locations/bordel.qsrc

@@ -1,7 +1,7 @@
 # bordel
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
-    $location_type = 'event'
+	$location_type = 'event'
 	menu_off = 1
 	gs 'stat'
 	'<center><b>Brothel</b></center>'
@@ -28,7 +28,7 @@ if $ARGS[0] = 'brothel':
 	$sexloc = 'bordel'
 	$loc_arg = $ARGS[0]
 	$loc = 'bordel'
-    $location_type = 'private'
+	$location_type = 'private'
 	$menu_loc = 'bordel'
 	$menu_arg = 'brothel'
 	menu_off = 0
@@ -88,7 +88,7 @@ if $ARGS[0] = 'dysh':
 	$loc = 'bordel'
 	$locM_arg = 'dysh'
 	$locM = 'bordel'
-    $location_type = 'bathroom'
+	$location_type = 'bathroom'
 	$locclass = 'restroom'
 	$menu_loc = 'bordel'
 	$menu_arg = 'dysh'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'dysh':
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
 	'Your room is so dedicated to its purpose that your clothes are stored in here.'
 	*nl
-	
+
 	act 'Return to your room':gt 'bordel', 'brothel'
 
 	act 'Bathroom functions': gt 'vann', 'start'
@@ -112,7 +112,7 @@ if $ARGS[0] = 'dysh':
 end
 
 if $ARGS[0] = 'var':
-    $location_type = 'event'
+	$location_type = 'event'
 	menu_off = 1
 	if $clothingworntype = 'nude':
 		bordelpay = 8
@@ -126,9 +126,9 @@ if $ARGS[0] = 'var':
 	borrand = rand(0, 10)
 
 	if borrand = 0:
-		bordelpay *= 100
+		bordelpay += 100
 		'A customer orders you (<<bordelpay>> <b>₽</b>).'
-		
+
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
@@ -155,7 +155,7 @@ if $ARGS[0] = 'var':
 			gt 'sex', 'start'
 		end
 	elseif borrand = 1:
-		bordelpay *= 100
+		bordelpay += 100
 		'A customer orders you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'var':
 			gt 'podrsex', 'start'
 		end
 	elseif borrand = 2:
-		bordelpay *= 150
+		bordelpay += 150
 		'Two clients book you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
@@ -213,7 +213,7 @@ if $ARGS[0] = 'var':
 			gt 'sexdvoe', 'start'
 		end
 	elseif borrand = 3:
-		bordelpay *= 150
+		bordelpay += 150
 		'Two clients book you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'var':
 			gt 'sexdvanadva', 'start'
 		end
 	elseif borrand = 4:
-		bordelpay *= 200
+		bordelpay += 200
 		'A group of customers order you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'

+ 103 - 103
locations/emp_functions.qsrc

@@ -8,33 +8,33 @@
 !! v.02 - Event generator partially integrated
 !! v.03 - Job management system integrated
 !! v. 04 - Start of event generation code integration
-!! 
+!!
 
 !! --------------------- UI Interface for Journal
 
 if $ARGS[0] = 'gen_schedule':
-	*clr & cla 
+	*clr & cla
 		if night_mode = 1 or night_mode = 2:
 		$header_theme = '#91B0B4'
 		$body_theme = '#303030'
-		$body_theme_alt  = '#474747'
+		$body_theme_alt	 = '#474747'
 		$font_theme = '#000000'
 	else
 		$header_theme = '#e27c00'
 		$body_theme = '#E0DED4'
-		$body_theme_alt  = '#D58B32'
+		$body_theme_alt	 = '#D58B32'
 		$font_theme = '#FFFFFF'
 	end
-	if  function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
-	if function_sw = 2: 
+	if	function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
+	if function_sw = 2:
 		gs 'journal', 'journalmenu'
 		'<center><h2>Work</h2></center>'
 	end
 	!! Enable selector if attending school or Uni by NPC group type or by character and set default to School
-	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1: 
+	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1:
 		if flag_schedule = 0: flag_schedule = 1
 		school_group = 1
-		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &  gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &  gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
+		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &	gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &	 gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
 	else
 		!! Set schedule to holiday / non-edu NPCs
 		flag_schedule = 3
@@ -43,11 +43,11 @@ if $ARGS[0] = 'gen_schedule':
 	!! Initiate loop variables
 
 	i_day = 1
-    mod_max_day = 7
+	mod_max_day = 7
 	i_hour = ARGS[1]
-    mod_max_hour = ARGS[1] + 8 
-    header_switch = 1
-	killvar '$tablebody'   
+	mod_max_hour = ARGS[1] + 8
+	header_switch = 1
+	killvar '$tablebody'
 	killvar '$tableheader'
 
 	!! create header, using header switch to fill in :00 or :30 automatically using mod to determine odd/even and set display hour automatically.
@@ -61,13 +61,13 @@ if $ARGS[0] = 'gen_schedule':
 		if header_switch = 1:
 			header_switch += 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<<display_hour >>', display_hour) + ':00</font></th>'
-		elseif header_switch=2: 
+		elseif header_switch=2:
 			header_switch = 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
-		end		
+		end
 		i_hour += 1
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
-	! Reset i_hour for next loop	
+	! Reset i_hour for next loop
 	killvar 'display_hour'
 	killvar 'header_switch'
 	i_hour = ARGS[1]
@@ -75,17 +75,17 @@ if $ARGS[0] = 'gen_schedule':
 	!! Close out table header
 	$tableheader += '</tr>'
 	!! Create table body, with alternating colour rows for legibility
-    :jmp_day_create
+	:jmp_day_create
 
-        !Set day
-        if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
-			$tablebody += '<tr><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		!Set day
+		if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
+			$tablebody += '<tr><td	style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		else
 			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
 		end
 		!! fill the slots from the NPC schedule
 
-        :jmp_hour_create 
+		:jmp_hour_create
 			if i_day >= 1:
 
 				!! Create function switcher:
@@ -94,15 +94,15 @@ if $ARGS[0] = 'gen_schedule':
 				!! 3: Event Tracker
 
 				if function_sw = 1 or function_sw = 0:
-					dynamic $schedule_tracker 
+					dynamic $schedule_tracker
 				elseif function_sw = 2:
-                    flag_active  = 1
-                    j_id = emp_rota_week[i_day +  '_' + i_hour]
-                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
-                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
-                    else
-                        $transient_tb  = 'Free'
-                    end
+					flag_active	 = 1
+					j_id = emp_rota_week[i_day +  '_' + i_hour]
+					if emp_rota_week[i_day +  '_' + i_hour] ! 0:
+						$transient_tb =	 '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+					else
+						$transient_tb  = 'Free'
+					end
 				elseif function_sw = 3:
 				else
 					msg 'Error - Failed to create body. Please set content switch.'
@@ -114,42 +114,42 @@ if $ARGS[0] = 'gen_schedule':
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
 					killvar '$transient_tb'
-				end	
+				end
 			else
 				 i_day += 1
 				 jump 'jmp_day_create'
 			end
 			i_hour += 1
-            if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
+			if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
 			$tablebody +='</tr>'
 			i_day += 1
 			i_hour = ARGS[1]
-        if i_day <= mod_max_day: jump 'jmp_day_create'	
+		if i_day <= mod_max_day: jump 'jmp_day_create'
 	!! Create navigaton bars
 	if (mod_max_hour + 8)  <= 48:
 		set_hour = ARGS[1] + 8
-		$msg_forward = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+		$msg_forward = '<a	href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
 	else
 		$msg_forward = 'End of Day'
 	end
-    if (mod_max_hour  - 8) >0 :
+	if (mod_max_hour  - 8) >0 :
 		set_hour = ARGS[1] - 8
-        $msg_back = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
-    else
+		$msg_back = '<a	 href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
+	else
 		$msg_back = 'Start of day'
-    end
-
-    !! Start the table constuction    
-    '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
-    '<<$msg_back>> | <<$msg_forward>>'
-    *nl
-    if  function_sw = 1:
-	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
 	end
-	if  function_sw = 2:
-		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>' 
+
+	!! Start the table constuction
+	'<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
+	'<<$msg_back>> | <<$msg_forward>>'
+	*nl
+	if	function_sw = 1:
+	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>'
 	end
-    act 'Back':
+	if	function_sw = 2:
+		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>'
+	end
+	act 'Back':
 		killvar 'flag_schedule'
 		killvar 'school_group'
 		killvar 'j_id'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' +emp_job_wages[j_id] + '<b>₽</b></p>'
-	
+
 	msg '<<$msg_body>>'
 end
 
@@ -179,7 +179,7 @@ end
 !! v. 02 - UI improvements and feature feedback
 !! V. 03 - Initial integration into mainline code
 
-if $ARGS[0] = 'evt_init'
+if $ARGS[0] = 'evt_init':
 
 !! Placeholder, pending integration
 
@@ -188,47 +188,47 @@ end
 
 if $ARGS[0] = 'disp_evt':
 	*clr & cla
-	
+
 	if ARGS[1] = '1':
 		gs 'emp_functions','evt_day_suffix'
 
 		'Hi <<$pcs_nickname>>, I have this job for you do you want to acccept it?'
 		*nl
 		'Event Scheduled for: ' + transient_evt_day + $evt_suffix + ', '+ $monthName[transient_evt_month] +' '+ ' 20' + transient_evt_year
-		'Job: ' + $evt_job[transient_evt_type]  			
+		'Job: ' + $evt_job[transient_evt_type]
 		'Pay: ' + transient_evt_wages
 		'Time: ' + transient_evt_hour + ':' +  iif(transient_evt_minutes  >= 0 and transient_evt_minutes <= 4, '00',  '30')
-		'Duration: ' + transient_evt_duration  + iif(transient_evt_duration  = 1, ' hour',  ' hours')
+		'Duration: ' + transient_evt_duration  + iif(transient_evt_duration	 = 1, ' hour',	' hours')
 		'location reminder: ' + $transient_mc_locat
-		
+
 		act 'Accept the job' : gs 'emp_functions', 'cat_evt'
-		act 'Decline the job': 
-			gs 'emp_functions',  'del_evt', 1
+		act 'Decline the job':
+			gs 'emp_functions',	 'del_evt', 1
 			gt 'emp_functions', 'init'
 		end
 	end
-		
-	
+
+
 	! create table for all jobs:
 	if ARGS[1] = 2:
-	
+
 	if evt_event[0] ! '':
-	
+
 		killvar '$tablebody'
 		job_idx = 0
 		'<center><h2>Current Task List</h2></center>'
 		*nl
 		:jmp_list_create
-			
-			
-			$tablebody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>' 
-			$tablebody += '<td>' + evt_wages[job_idx] + '</td><td>' + evt_hour[job_idx] + ':' +  iif(evt_minutes[job_idx]  >= 0 and evt_minutes[job_idx] <= 4, '00',  '30') + '</td>'
-			$tablebody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $transient_mc_locat + '</td>'
+
+
+			$tablebody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>'
+			$tablebody += '<td>' + evt_wages[job_idx] + '</td><td>' + evt_hour[job_idx] + ':' +	 iif(evt_minutes[job_idx]  >= 0 and evt_minutes[job_idx] <= 4, '00',  '30') + '</td>'
+			$tablebody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',	 ' hours') + '</td><td>' + $transient_mc_locat + '</td>'
 			$tablebody += '<td><a  href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
-				
+
 			job_idx += 1
 			if job_idx < arrsize('evt_event') : jump 'jmp_list_create'
-					
+
 			$tableheader = '<tr><th>Date</th><th>Task</th><th>Pay</th><th>Time</th><th>Duration</th><th>Location</th><th>Cancel Job</th></tr>'
 			'<center><table width="90%" align="center" width="90%" cellspacing="5" cellpadding="5" valign="top"><tr><<$tableheader>><<$tablebody>></tr></table></center>'
 			act 'Return' : killvar '$tablebody' & gt 'emp_functions', 'init'
@@ -238,30 +238,30 @@ if $ARGS[0] = 'disp_evt':
 	end
 end
 
-if $ARGS[0] = 'gen_evt':	
+if $ARGS[0] = 'gen_evt':
 
 	!! find a suitable date
 
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
-		srch_day_l = monthsend[transient_evt_month]  - rand(7,14)
+		srch_day_l = monthsend[transient_evt_month]	 - rand(7,14)
 	else
 		srch_day_l = rnd_day
 	end
 
 	:setdayloop
-	gs 'shortgs', 'dow',  transient_evt_year, transient_evt_month,  srch_day_l
+	gs 'shortgs', 'dow',  transient_evt_year, transient_evt_month,	srch_day_l
 	! 'idx day: ' + srch_day_l
-	if result =  transient_evt_dow: 
+	if result =	 transient_evt_dow:
 		transient_evt_day = srch_day_l
 		!'Day of week <<transient_evt_day>> : <<$week[result]>> '
 	srch_day_l = 99
-	else	        
-	srch_day_l += 1					
-	end 	
+	else
+	srch_day_l += 1
+	end
 
-	if srch_day_l <= srch_day_u: jump 'setdayloop'	
+	if srch_day_l <= srch_day_u: jump 'setdayloop'
 
 end
 
@@ -294,7 +294,7 @@ if $ARGS[0] = 'wage_evt':
 	elseif ARGS[1] = 3:
 		transient_evt_wages =  func('shortgs','round_tool',rand(1000,2000), 50)
 	elseif ARGS[1] > 4:
-	transient_evt_wages  = ARGS[2]
+	transient_evt_wages	 = ARGS[2]
 	end
 end
 
@@ -315,13 +315,13 @@ if $ARGS[0] = 'cat_evt':
 	evt_wages[] = transient_evt_wages
 	$evt_mc_locat[] = $transient_mc_locat
 	$evt_loc[] = $transient_loc
-	$evt_loc_arg[] = $transient_arg 
+	$evt_loc_arg[] = $transient_arg
 	$evt_exec[] = $transient_trigger
 	$evt_media[] = $transient_img
 
 
 	'Job accepted, you currently have ' + arrsize('evt_event') + ' jobs assigned to you. Please look at your journal for more information.'
-	gs 'emp_functions',  'del_evt', 1
+	gs 'emp_functions',	 'del_evt', 1
 	act 'Return': gt 'emp_functions', 'evt_init'
 end
 
@@ -334,34 +334,34 @@ if $ARGS[0] = 'del_evt':
 		killvar 'transient_event_type'
 		killvar 'transient_evt_year'
 		killvar 'transient_evt_month'
-		killvar 'transient_evt_hour'	
+		killvar 'transient_evt_hour'
 		killvar 'transient_evt_minutes'
 		killvar 'transient_evt_duration'
 		killvar 'transient_evt_wages'
 		killvar '$transient_loc '
 		killvar '$transient_arg'
-		killvar '$transient_trigger'	
+		killvar '$transient_trigger'
 		killvar '$transient_img'
-		killvar 'rnd_min'	
+		killvar 'rnd_min'
 		killvar 'mseed'
-		killvar 'dseed' 
+		killvar 'dseed'
 	end
 
 	! Delete array entry
 
 	if ARGS[1] = 2:
 		!! delete event after firing or cancelled.
-		!! killvar 'arr_name', index 
+		!! killvar 'arr_name', index
 		if ARGS[2] >= 0:
 			evt_idx = ARGS[2]
 			cla
-			'You''re about to delete this job: ' 
-			'Delete: ' + evt_event 
+			'You''re about to delete this job: '
+			'Delete: ' + evt_event
 			'Index: ' + evt_idx
 			Act 'Confirm?':
 				cla
 				'Are you sure?'
-				act 'Deleting': 
+				act 'Deleting':
 					cla
 					killvar 'evt_silent', evt_idx
 					killvar 'evt_event', evt_idx
@@ -379,19 +379,19 @@ if $ARGS[0] = 'del_evt':
 					killvar '$evt_exec', evt_idx
 					killvar '$evt_media', evt_idx
 					act 'Return': gt 'emp_functions', 'init'
-				end 	 
+				end
 				act 'Cancel': gt 'emp_functions', 'init'
 			end
 		else
 			'<<evt_idx>> - Invalid record - please check your index'
 		end
-	end 
+	end
 end
 
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '': 
+	if ARGS[1] ! '':
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -407,8 +407,8 @@ if $ARGS[0] = 'evt_day_suffix':
 	elseif test_day = 1 or test_day = 31:
 		$evt_suffix = 'st'
 	elseif test_day = 2:
-		$evt_suffix = 'nd'    
-	elseif test_day= 3: 
+		$evt_suffix = 'nd'
+	elseif test_day= 3:
 		$evt_suffix = 'rd'
 	else
 		$evt_suffix = 'th'
@@ -427,15 +427,15 @@ end
 
 if $ARGS[0] = 'emp_booking':
 	gs 'emp_functions', 'emp_chk_clk'
-	if emp_rota_fail  = 0:	
+	if emp_rota_fail  = 0:
 		gs 'emp_functions', 'loop_configure'
 		j_finish = emp_job_end[j_id]
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				emp_rota_week[d_idx + '_' + j_idx]	= j_id
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			if j_idx <= j_finish: jump 'jmp_hour_book'
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		emp_job_status[j_id] = 1
@@ -451,23 +451,23 @@ if $ARGS[0] = 'emp_booking':
 	killvar 'emp_rota_fail'
 end
 
-!! check if time slots are avaialble for this role. 
+!! check if time slots are avaialble for this role.
 
-if $ARGS[0] = 'emp_chk_clk':	
+if $ARGS[0] = 'emp_chk_clk':
 	gs 'emp_functions', 'loop_configure'
 	j_finish = emp_job_end[j_id]
 	:jmp_daily_chk
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
 			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
-				!! booking failed					
+				!! booking failed
 				emp_rota_fail = 1
 			else
 				!! booking passed
 				emp_rota_fail = 0
-			end	
+			end
 			j_idx +=1
-		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'	
+		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'
 		d_idx += 1
 	if d_idx <= d_end and emp_rota_fail = 0: jump 'jmp_daily_chk'
 end
@@ -481,7 +481,7 @@ if $ARGS[0] = 'emp_terminate':
 			:jmp_hour_book
 				emp_rota_week[d_idx + '_' + j_idx] = 0
 				j_idx += 1
-			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			if j_idx <= j_finish: jump 'jmp_hour_book'
 			d_idx += 1
 		if d_idx <= d_end: jump 'jmp_daily_book'
 		!! Set the termination value
@@ -493,20 +493,20 @@ if $ARGS[0] = 'emp_terminate':
 	killvar 'j_idx'
 	killvar 'j_finish'
 	killvar 'd_idx'
-	killvar 'd_end'	
+	killvar 'd_end'
 end
 
-if $ARGS[0] = 'loop_configure':	
-	if  j_day= 0 or j_day = 1 or j_day = 2:
+if $ARGS[0] = 'loop_configure':
+	if	j_day= 0 or j_day = 1 or j_day = 2:
 		d_idx = 1
 	else
 		d_idx= 6
 	end
-	if  j_day <= 1:
+	if	j_day <= 1:
 		d_end = 5
 	else
 		d_end= 7
-	end	
+	end
 end
 --- emp_functions ---------------------------------
 

+ 1 - 0
locations/gkafe.qsrc

@@ -143,6 +143,7 @@ if $ARGS[0] = 'boris':
 	'<a href="exec: gt ''motherkafeboss''">Talk.</a>'
 
 	act 'Return':gt 'gkafe'
+	act 'Talk': gt 'motherkafeboss'
 end
 
 --- gkafe ---------------------------------

+ 20 - 20
locations/gopskver.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = '':
 				if $prevloc = 'gkafe':
 					gt 'gkafe'
 				else
-					gt 'pav_park', 'start'
+					gt 'pav_park', 'deeper_park'
 				end
 			end
 
@@ -51,7 +51,7 @@ if $ARGS[0] = '':
 					if $prevloc = 'gkafe':
 						gt 'gkafe'
 					else
-						gt 'pav_park', 'start'
+						gt 'pav_park', 'deeper_park'
 					end
 				end
 
@@ -92,14 +92,14 @@ if $ARGS[0] = '':
 						if $prevloc = 'gkafe':
 							gt 'gkafe'
 						else
-							gt 'pav_park', 'start'
+							gt 'pav_park', 'deeper_park'
 						end
 					end
 				end
 			end
 		elseif hour >= 20:
 			*nl
-			act 'Leave':gt 'pav_park', 'start'
+			act 'Leave':gt 'pav_park', 'deeper_park'
 			if week = 5 or week = 6:
 				'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
 				act 'Go to the disco with the boys': minut += 15 & gt 'pav_disco'
@@ -112,7 +112,7 @@ if $ARGS[0] = '':
 		if hour >= 20:
 			if alko < 6:
 				*nl
-				act 'Leave':gt 'pav_park', 'start'
+				act 'Leave':gt 'pav_park', 'deeper_park'
 				if week = 5 or week = 6:
 					'It''s evening, and the boys are getting ready to go to the disco like they do every friday and saturday. You could call it a night and leave them alone, or tag along.'
 					act 'Go to the disco with the boys': minut += 15 & gt 'pav_disco'
@@ -263,7 +263,7 @@ if $ARGS[0] = '':
 						if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 							gt $prevloc
 						else
-							gt 'pav_park', 'start'
+							gt 'pav_park', 'deeper_park'
 						end
 					end
 
@@ -279,7 +279,7 @@ if $ARGS[0] = '':
 							if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 								gt $prevloc
 							else
-								gt 'pav_park', 'start'
+								gt 'pav_park', 'deeper_park'
 							end
 						end
 						if hour = 20:
@@ -308,7 +308,7 @@ if $ARGS[0] = '':
 								if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 									gt $prevloc
 								else
-									gt 'pav_park', 'start'
+									gt 'pav_park', 'deeper_park'
 								end
 							end
 						end
@@ -326,7 +326,7 @@ if $ARGS[0] = '':
 							'You smile and nod at him: "I like getting guys all worked up with my body, that''s true. Why?"'
 							'Vasily stutters for a moment, and then manages to say: "Oh n- no reason, I was just curious is all."'
 
-							act 'Thank them for the beer and leave':gt 'pav_park', 'start'
+							act 'Thank them for the beer and leave':gt 'pav_park', 'deeper_park'
 						end
 
 						act '"What? No!"':
@@ -335,7 +335,7 @@ if $ARGS[0] = '':
 							'You raise your voice a little and act surprised: "What? No way! Whoever told you that was lying!"'
 							'However, Dan doesn''t fall for your act, and matter-of-factly says: "<<$pcs_nickname>>, you''re a slut. We''ve all seen you, the whole town knows it. Why are you even trying to deny it? You''re such a terrible liar..."'
 
-							act 'Leave':gt 'pav_park', 'start'
+							act 'Leave':gt 'pav_park', 'deeper_park'
 						end
 					elseif fame['pav_slut'] < 250:
 						if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
@@ -381,7 +381,7 @@ if $ARGS[0] = '':
 											'The boys take out some markers and write several obscene words onto your skin. Soon, the whole town can read what a huge slut you are!'
 											'You don''t want to anger them any further, knowing the boys are much stronger than you, and don''t dare to protest while they keep writing more things on you. Eventually they''re satisfied, and let you get up. They even let you put your clothes back on, so you can cover up at least the majority of the writings. Dan smirks: "Maybe that''ll help you remember what you are, slut. When you''re ready to apologize, you know where to find us."'
 
-											act 'Leave':gt 'pav_park', 'start'
+											act 'Leave':gt 'pav_park', 'deeper_park'
 										end
 									else
 										act 'Keep refusing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -433,7 +433,7 @@ if $ARGS[0] = '':
 				elseif $prevloc = 'pav_train_hall':
 					act 'Blush and quickly leave the train station': gt $prevloc
 				else
-					act 'Blush and keep walking':gt 'pav_park', 'start'
+					act 'Blush and keep walking':gt 'pav_park', 'deeper_park'
 					if BjBeerQW >= 5:
 						act 'Approach the guys': gt'zsoft_gopskverGorSlut','1'
 					elseif BjBeerQW < 5:
@@ -442,7 +442,7 @@ if $ARGS[0] = '':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big11.jpg"></center>'
 								'Vasily smirks and slaps your hand away: "Go beg somewhere else, whore. You''ve had enough for today, the open bar is closed for sluts like you. Come back tomorrow."'
-								act 'Leave them and walk away':gt 'pav_park', 'start'
+								act 'Leave them and walk away':gt 'pav_park', 'deeper_park'
 
 							else
 								gt 'gopskver', 'BjBeerStart'
@@ -481,7 +481,7 @@ if $ARGS[0] = 'BjBeerStart':
 				gs 'stat'
 				if pcs_stren + pcs_agil + pcs_run >= 180:
 					'The Gopniks don''t take your refusal very well, and try to force you anyway when they realize you''re not going to do what they want. However, your athletic training pays off and you manage to outrun them. Once you''re certain they''re no longer following you, you stop for a moment to catch your breath.'
-					act 'Return to the park': gt 'pav_park', 'start'
+					act 'Return to the park': gt 'pav_park', 'deeper_park'
 				else
 					gt 'gopskver', 'BjBeerBeaten'
 				end
@@ -749,7 +749,7 @@ if $ARGS[0] = 'BjBeerFace':
 
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 			'Dan grins at you and offers you his unfinished bottle, and smiles when you drink it eagerly. Your mood improves slightly.'
-			act 'Return to the park': BjBeerActiv = 0 & gt 'pav_park', 'start'
+			act 'Return to the park': BjBeerActiv = 0 & gt 'pav_park', 'deeper_park'
 
 		elseif BjBeerActiv = 0:
 			pcs_mood = -10
@@ -760,7 +760,7 @@ if $ARGS[0] = 'BjBeerFace':
 			'Dan shrugs: "It took you way too long to finish us off, we drank all the beer in the meantime."'
 			'He grins as he shows you the empty bottle. You bite your lip in frustration and disappointment when you mutter: "But... but I... how..."'
 			'Maybe you should try harder, next time.'
-			act 'Return to the park': gt 'pav_park', 'start'
+			act 'Return to the park': gt 'pav_park', 'deeper_park'
 		end
 	end
 end
@@ -951,7 +951,7 @@ if $ARGS[0] = 'BjBeerVag':
 					*nl
 					'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 					'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
-					act 'Return to the park': gt 'pav_park', 'start'
+					act 'Return to the park': gt 'pav_park', 'deeper_park'
 				end
 			end
 		end
@@ -1072,7 +1072,7 @@ if $ARGS[0] = 'BjBeerAnal2':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/gop/bjbeer<<Beerrand>>.jpg"></center>'
 				'Dan grins and gives you his unfinished bottle of beer: "Here you go, slut. You''ve earned it."'
 				'You eagerly drink the beer with a content smile on your lips. Your mood improves slightly.'
-				act 'Return to the park': gt 'pav_park', 'start'
+				act 'Return to the park': gt 'pav_park', 'deeper_park'
 			end
 		end
 	end
@@ -1165,7 +1165,7 @@ if $ARGS[0] = 'triple_blow':
 						'You nod your head meekly and say in a soft voice: "I understand."'
 						'The boys give you an approving nod, and Dan says: "You''re a smart slut, that makes me happy. Most of them need longer to accept their place in life. Anyway... get the hell out, the mess on your face is ruining my appetite."'
 
-						act 'Leave':gt 'pav_park', 'start'
+						act 'Leave':gt 'pav_park', 'deeper_park'
 					end
 
 					act 'Object':
@@ -1179,7 +1179,7 @@ if $ARGS[0] = 'triple_blow':
 						'You don''t like the sound of that. When you carefully try to open your eyes again you notice the guys have surrounded you, and they all have their cocks out. Your vision is still blurry though, and you shriek in disgust when you feel a stream of urine hit your face. Then another, and a third. You realize you can''t fight off the three of them, and just let it happen.'
 						'Noticing your change in demeanour, Dan smirks at you when the streams have dried up: "That''s right, whore, just let it happen. Let that be a reminder for you... now get the fuck out of here and clean yourself up, you look disgusting."'
 
-						act 'Leave':gt 'pav_park', 'start'
+						act 'Leave':gt 'pav_park', 'deeper_park'
 					end
 				end
 			end

+ 4 - 3
locations/pav_aptcourtev.qsrc

@@ -489,7 +489,8 @@ if $ARGS[0] = 'events2':
 			else
 				if grupTipe = 3:
 					'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to, nerd?" he asks in a teasing tone as you sit down.'
-					'Dan glances over at you with a sneer. "You sure you should be here? This part of the park isn''t really for people like you." You glance around and notice a few other hard looks being tossed your way.'
+					'Dan glances over at you with a sneer. "You sure you should be here? This group isn''t really for people like you." You glance around and notice a few other hard looks being tossed your way.'
+					act 'Move away':gt 'pav_complex', 'start'
 				else
 					'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to?" he asks in a teasing tone as you sit down.'
 					'Dan glances over at you with a sneer. "Looking to slum it a little, princess? Got tired of all the limp dicks you normally hang out with and want to know what a real cock feels like?"'
@@ -500,13 +501,13 @@ if $ARGS[0] = 'events2':
 						grupvalue[4] -= 2
 						gs 'stat'
 						'Starting to feel nervous, you glance down at your phone. "Oh I didn''t notice the time, I need to get going." You wave at them and start walking away as you hear them laughing behind you.'
-						act 'Move away':gt 'pav_park', 'deeper_park'
+						act 'Move away':gt 'pav_complex', 'start'
 					end
 					act 'Make small talk':
 						minut += 5
 						gs 'stat'
 						'You tell Vasily about what''s been going on lately in your life and make small talk with the guys for a while, but they seem to quickly get tired of listening and tell you that they''ve got things to do. They grab the few beers left and walk away without inviting you to join them.'
-						act 'Move away':gt 'pav_park', 'deeper_park'
+						act 'Move away':gt 'pav_complex', 'start'
 					end
 					act 'Ask for a beer':
 						grupvalue[4] += 1

+ 26 - 25
locations/pav_parkev.qsrc

@@ -829,36 +829,37 @@ if $ARGS[0] = 'gopboys':
 			if grupTipe = 3:
 				'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to, nerd?" he asks in a teasing tone.'
 				'Dan glances over at you with a sneer. "You sure you should be here? This part of the park isn''t really for people like you." You glance around and notice a few other rugged looks tossed your way.'
+				act 'Move away':gt 'pav_park', 'deeper_park'
 			else
 				'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. As you sit down, he asks in a teasing tone, "What you up to?" he asks in a teasing tone as you take a seat.'
 				'Dan glances over at you with a sneer. "Looking to slum it a little, princess?"'
 				'Pauline snorts a laugh. "She probably got tired of all the limp dicks she normally hangs out with and wants to know what a real cock feels like."'
 				'Roman grins at that. "Is that it? You looking for some real cock?" You glance around and notice a few other rugged looks tossed your way. You know the gopniks have a bad reputation. Maybe hanging out with them in a deserted place isn''t the best idea...'
-			end
-			act 'Make excuse and leave':
-				*clr & cla
-				minut += 1
-				grupvalue[4] -= 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
-				'Starting to feel nervous, you glance down at your phone. "Oh, I didn''t notice the time. I need to get going." You wave bye to them and start walking away. You can hear them laughing behind you as you leave.'
-				act 'Move away':gt 'pav_park', 'deeper_park'
-			end
-			act 'Make small talk':
-				*clr & cla
-				minut += 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
-				'You make small talk with the guys for a while, but they seem to quickly get tired of listening and tell you they''ve got things to do before they grab the few beers left and leave without inviting you to join them.'
-				act 'Move away':gt 'pav_park', 'deeper_park'
-			end
-			act 'Ask for a beer':
-				*clr & cla
-				grupvalue[4] += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
-				'"How about you pass me one of those beers?" you ask as you take a seat.'
-				'Vasily laughs and hands you a beer.'
-				act 'Drink beer': gt 'pav_parkev', 'male_gopnik_beer'
+				act 'Make excuse and leave':
+					*clr & cla
+					minut += 1
+					grupvalue[4] -= 2
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
+					'Starting to feel nervous, you glance down at your phone. "Oh, I didn''t notice the time. I need to get going." You wave bye to them and start walking away. You can hear them laughing behind you as you leave.'
+					act 'Move away':gt 'pav_park', 'deeper_park'
+				end
+				act 'Make small talk':
+					*clr & cla
+					minut += 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
+					'You make small talk with the guys for a while, but they seem to quickly get tired of listening and tell you they''ve got things to do before they grab the few beers left and leave without inviting you to join them.'
+					act 'Move away':gt 'pav_park', 'deeper_park'
+				end
+				act 'Ask for a beer':
+					*clr & cla
+					grupvalue[4] += 1
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/gopnik/gopnik_boys.jpg"></center>'
+					'"How about you pass me one of those beers?" you ask as you take a seat.'
+					'Vasily laughs and hands you a beer.'
+					act 'Drink beer': gt 'pav_parkev', 'male_gopnik_beer'
+				end
 			end
 		end
 	end

+ 11 - 11
locations/sexshop.qsrc

@@ -130,12 +130,12 @@ if $ARGS[0] = 'start':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					pornstudio = 1
-                    'You shake your head and quickly move away from the man, feeling his gaze on the back of your head the entire time.'					
+                    'You shake your head and quickly move away from the man, feeling his gaze on the back of your head the entire time.'
 					gt 'sexshop', 'start'
 				end
 			else
 				act 'Refuse (<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
 
@@ -368,7 +368,7 @@ end
 
 if $ARGS[0] = 'panties2':
 	cla
-	
+
 	if sexshop_panties[i] ! 0:
 		msg 'You already own these panties.'
 		gt 'sexshop', 'panties'
@@ -398,7 +398,7 @@ end
 
 if $ARGS[0] = 'bras2':
 	cla
-	
+
 	if sexshop_bras[i] ! 0:
 		msg 'You already own this bra.'
 		gt 'sexshop', 'bras'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'toi':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 
 	act 'Leave the toilet':gt 'sexshop', 'podval'
-	
+
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'
 
@@ -469,7 +469,7 @@ if $ARGS[0] = 'pip':
 	'The small booth has a TV on the wall, a terminal to choose films and a chair to sit in. There is also two holes in the walls at waist level.'
 	if mistressqwest > 0 and mistressqwest <= 20:
 		GHchance = rand(6,10)
-		ghnowcheck = ghnow		
+		ghnowcheck = ghnow
 	else
 		GHchance = rand(1,10)
 		ghnowcheck = ghnow * 2
@@ -499,7 +499,7 @@ if $ARGS[0] = 'pip':
 				act 'The film ends':gt 'sexshop', 'pip'
 			end
 
-			
+
 			if GHchance >= 10 - ghnowcheck:
 				'You hear the TV in the next stall turn on.'
 
@@ -870,15 +870,15 @@ if $ARGS[0] = 'kendraanal':
 						end
 					else
 						act 'Resist (<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
 			else
 				act 'Resist (<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
 	else
 		act 'Resist (<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
 
 if $ARGS[0] = 'kendrafinish':
@@ -925,7 +925,7 @@ if $ARGS[0] = 'shprod':
 			end
 		else
 			act 'Push him away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 		act 'Let him':gs 'boyStat', 'A181' & gt 'sex', 'kuni'
 	end
 end

+ 29 - 27
locations/vasilyhome.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'home':
 			'You move your hand to knock on the door, but stop yourself. It''s too early and they won''t be out of bed yet.'
 			if npc_rel['A112'] >= 70: 'You could use the key that Sergey gave you to enter the apartment quietly.' & act 'Unlock the door and enter':gt 'vasilyhome', 'hallway'
 		else
-			'The door is opened by Vasily, who looks at you for a second before he stands aside to let you in.' 
+			'The door is opened by Vasily, who looks at you for a second before he stands aside to let you in.'
 			act 'Enter':gt 'vasilyhome', 'hallway'
 		end
 		act 'Leave':minut += 1 & gt'pod_ezd','etaj_3'
@@ -109,7 +109,7 @@ if $ARGS[0] = 'livingroom':
 	$loc_arg = 'livingroom'
 	$loc = 'vasilyhome'
 	$locM_arg = 'livingroom'
-	$locM = 'vasilyhome'	
+	$locM = 'vasilyhome'
 	!Daily discussions:
 	!Vasily
 	if bazar_day ! daystart: bazar_count = 10
@@ -327,7 +327,7 @@ if $ARGS[0] = 'vasily_beer':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pjanaja'+rand(1,8)+'.jpg"></center>'
 		'You''re almost too drunk to stand. The boys notice and start harassing you.'
 		'"We let you drink for free all night, <<$pcs_nickname>>. Show us a little skin as a thank you," Vasily says with a grin.'
-		
+
 		if fame['pav_slut'] < 200 or kotovLoveQW > 0:
 			if kotovLoveQW <= 0: gs 'willpower', 'sex', 'resist'
 			if will_cost <= pcs_willpwr and kotovLoveQW <= 0:
@@ -382,7 +382,7 @@ if $ARGS[0] = 'drunken_sleep':
 	pcs_mood -= 25
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/pohmel'+rand(1,4)+'.jpg"></center>'
-	'You passed out for about three hours and wake up with a splitting headache and only vague memories of your night with the guys. Remembering that somebody deserved a kick in the balls, you look around the room. Vasily is passed out in a heap on the sofa with no sign of the other two.' 
+	'You passed out for about three hours and wake up with a splitting headache and only vague memories of your night with the guys. Remembering that somebody deserved a kick in the balls, you look around the room. Vasily is passed out in a heap on the sofa with no sign of the other two.'
 	'"It was probably Dan that deserved a kick..." you mutter to yourself as you try to get your bearings.'
 	act 'Clear your head': gt 'vasilyhome', 'livingroom'
 end
@@ -473,7 +473,7 @@ if $ARGS[0] = 'vasily_bazar_night':
 			'"Give it a rest, <<$pcs_nickname>>. How about a drink instead?" Vasily offers.'
 		elseif fame['pav_slut'] < 200:
 			vasyan_textb = rand(0,8)
-			if vasyan_textb = 0: 
+			if vasyan_textb = 0:
 				'"Life is like a Matryoshka doll," Vasily says mysteriously.<br> "What the hell is that supposed to mean?" you ask.<br> "Think about it," is all he says.<br> You roll you eyes and give him a sarcastic: "Oh I will."'
 			elseif vasyan_textb = 1:
 				'"I love <<$pcs_haircol>> hair, and it looks so good on you <<$pcs_nickname>>."<br> "Thanks Vasily. That''s very sweet," you reply while blushing.<br> "Does the carpet match the drapes?" he asks with a smirk.<br> "Typical," is all you answer with an exasperated sigh.'
@@ -618,19 +618,19 @@ if $ARGS[0] = 'dan_bazar':
 		if den_textb = 2: $den_textb = '"<<$pcs_nickname>>, get over here and make yourself useful. I need a back massage, and you look like just the right girl for the job," Dan hollers. <br>  "How would you like a swift kick instead? Even if you had bothered to ask me nicely, I still would''t have done it. It never hurts to be polite," you smirk back at him sweetly.'
 		if den_textb = 3: $den_textb = 'Dan asks you to grab him a beer. When you return from the kitchen with his beer, he politely asks you to open it for him. Rolling your eyes, you crack it open and hand it over to him. <br>"Thanks <<$pcs_nickname>>. You''re going to make a fine little wife," Dan laughs.<br>  You give him a kick in the shin before turning to leave. He just laughs, and sends you on your way with a smack on the ass.'
 		if den_textb = 4: $den_textb = '"<<$pcs_nickname>>, if you''re looking for work I hear the hotel is hiring. They have a job opening for a <<$pc_desc[''lips'']>> set of lips," Dan says.<br>  You flick your hand between his legs, and he lets out a sharp cry of pain. "Thanks for the tip asshole," you smile back at him.'
-		if den_textb = 5: $den_textb = 'Dan gives you his opinion on religion. "A church is no fit place for a woman on her knees. That should be reserved for places like alleys, bathrooms and living rooms. Speaking of which; <<$pcs_nickname>>, would you be a dear?"<br>  You walk away shaking your head before he can finish.'
+		if den_textb = 5: $den_textb = 'Dan gives you his opinion on religion. "A church is no fit place for a woman on her knees. That should be reserved for places like alleys, bathrooms and living rooms. Speaking of which; <<$pcs_nickname>>, would you be a dear?"<br>	You walk away shaking your head before he can finish.'
 		if den_textb = 6: $den_textb = 'Unprompted, Dan turns to you and says "You got a real pretty mouth girl," in his best creepy accent.<br>  You swiftly raise your knee like you are going for his crotch, but stop short and just walk past him. Seeing him instinctively double over in fear puts a little spring in your step.'
 
 		den_textb_gorslut = rand(0,7)
-		if den_textb_gorslut = 0: $den_textb_gorslut =  'Dan looks at you appraisingly. "<<$pcs_nickname>>, do you have any money? If you need some, then I''m sure I could find some work putting your body to good use."<br>  "Dream on. The only work I''m thinking of using this body for involves a swift kick between your balls!" you snarl.<br>  With one hand protecting his nuts, Dan says "Settle down, slut. I wasn''t suggesting you become a whore. Honestly, I was just thinking out loud. I mean if you''re already giving it away for free, then why not?" You leave in a huff before he can finish.'
+		if den_textb_gorslut = 0: $den_textb_gorslut =	'Dan looks at you appraisingly. "<<$pcs_nickname>>, do you have any money? If you need some, then I''m sure I could find some work putting your body to good use."<br>	"Dream on. The only work I''m thinking of using this body for involves a swift kick between your balls!" you snarl.<br>	 With one hand protecting his nuts, Dan says "Settle down, slut. I wasn''t suggesting you become a whore. Honestly, I was just thinking out loud. I mean if you''re already giving it away for free, then why not?" You leave in a huff before he can finish.'
 		if den_textb_gorslut = 1 and soniaPS = 1: $den_textb_gorslut = 'Dan mockingly issues you a challenge.<br> "<<$pcs_nickname>>, I can''t decide if I prefer your cute set of <<$pc_desc[''lips'']>> lipss or Sonia''s. We need to all get together to find out who has the best skills. I have a warm wet surprise for the winner."<br>  "Dream on!" you say while shaking your head, though you do wonder if you might be able to best her.'
-		if den_textb_gorslut = 1 and soniaPS <=0: $den_textb_gorslut = 'Dan is idly going on about what a good girl Sonia is when he turns to you and says "Hey <<$pcs_nickname>>, you''re friends with Sonia, right?"<br>  "Not this again, Dan..." you say with a weary sigh.<br> "Oh, come on! You both like to have a good time. It could be a lot of fun," he replies.<br>  You stop him right there. "Listen Dan. I like Sonia, but she has a look in her eyes lately that makes me nervous. Besides, any girl willing to sleep with you has to be half mad. Getting two of us in the same room might be more than you could handle..." You give him a little sway of your hips as you walk away.'
+		if den_textb_gorslut = 1 and soniaPS <=0: $den_textb_gorslut = 'Dan is idly going on about what a good girl Sonia is when he turns to you and says "Hey <<$pcs_nickname>>, you''re friends with Sonia, right?"<br>	"Not this again, Dan..." you say with a weary sigh.<br> "Oh, come on! You both like to have a good time. It could be a lot of fun," he replies.<br>	 You stop him right there. "Listen Dan. I like Sonia, but she has a look in her eyes lately that makes me nervous. Besides, any girl willing to sleep with you has to be half mad. Getting two of us in the same room might be more than you could handle..." You give him a little sway of your hips as you walk away.'
 		if den_textb_gorslut = 2 and soniaPS = 1: $den_textb_gorslut = '"Yesterday, Sonia was servicing every boy in the mens bathroom in any fashion they desired," Dan says. "Not too long ago, she was such a stuck up goody-two-shoes. Now she doesn''t have a care in the world. You could probably learn a thing or two from her <<$pcs_nickname>>."<br> You just stare back at him with your arms crossed as he slowly moves a hand in front of his crotch for protection.'
 		if den_textb_gorslut = 2 and soniaPS <=0: $den_textb_gorslut = '"Be a dear and fetch me another beer, <<$pcs_lastname>>," Dan says.<br> You head to the kitchen and grab a beer. You take a little sip and give him a smile when you hand it to him. He gives you a rough slap on the ass as he sends you away giggling.'
 		if den_textb_gorslut = 3: $den_textb_gorslut = 'Dan looks like he''s up to something. "<<$pcs_nickname>>, who''s your best girlfriend at school?"<br>  "Why?" you ask while giving him a stern look.<br> "Well, I was just thinking maybe you''d like to bring a friend on one of your visits here?" Dan says, trying his best to sound diplomatic.<br> Your anger boils over as you say "Don''t you think for one second that I''m going to drag some innocent girl back here and throw her to you jackals. If you''re so desperate to have a three-way, I would be happy to let you help me suck Vitek''s cock right now." <br> You hear Dan mutter under his breath. "Bitch, what the hell crawled up your ass tonight?" You turn to leave.'
 		if den_textb_gorslut = 4: $den_textb_gorslut = '"Hey babe, how about you stop by the park the next time we''re hanging out there and have some beers with us? You''re so much fun when you get a few beers in you," Dan says while roughly giving your ass a squeeze.<br>  You give him a playful slap on the thigh and a giggle.'
-		if den_textb_gorslut = 5: $den_textb_gorslut = '"<<$pcs_nickname>>, hand me the TV remote," Dan says.<br>  He''s way closer to it than you, but he looks comfortable, so you happily fetch it for him.<br>  "Good girl," he praises.'
-		if den_textb_gorslut = 6: $den_textb_gorslut = '"<<$pcs_nickname>>, does your sister still work at the local supermarket?" Dan asks. <br>  "Yeah, but she doesn''t enjoy it much, so I try not to bother her when she''s working," you inform him.<br>  "You should bring her over here sometime. I bet we could find a way to cheer her up..." he says suggestively.<br>  "God, is sex the only thing you ever think about?! And what on earth makes you think I would do that sort of thing with my sister?" you say a little sheepishly while giving him a sideways glance.'
+		if den_textb_gorslut = 5: $den_textb_gorslut = '"<<$pcs_nickname>>, hand me the TV remote," Dan says.<br>  He''s way closer to it than you, but he looks comfortable, so you happily fetch it for him.<br>	"Good girl," he praises.'
+		if den_textb_gorslut = 6: $den_textb_gorslut = '"<<$pcs_nickname>>, does your sister still work at the local supermarket?" Dan asks. <br>  "Yeah, but she doesn''t enjoy it much, so I try not to bother her when she''s working," you inform him.<br>	"You should bring her over here sometime. I bet we could find a way to cheer her up..." he says suggestively.<br>  "God, is sex the only thing you ever think about?! And what on earth makes you think I would do that sort of thing with my sister?" you say a little sheepishly while giving him a sideways glance.'
 		if den_textb_gorslut = 7: $den_textb_gorslut = 'Dan tells you about his visit to the strip club. "You need an ID to get in, but once you do it''s great. They have some of the best looking women I''ve ever seen in there, and I think on some nights they even have male strippers for ladies."'
 		if bazar_count_den <= 0: '"Be quiet, <<$pcs_nickname>>! That''s enough talk out of you tonight. Leave me in peace, unless you want to put those <<$pc_desc[''lips'']>> lips to better use," he says.'
 		if fame['pav_slut'] < 200 and bazar_count_den > 0: '<<$den_textb>>'
@@ -681,27 +681,27 @@ if $ARGS[0] = 'vitek_bazar':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/talk/talk'+rand(1,5)+'.jpg"></center>'
 		vitek_textb = rand(0,7)
-		if vitek_textb = 0: $vitek_textb = '"Any chance I could get you to come over and do some cleaning? My apartment is such a wreck that it''s virtually uninhabitable. It could really use a woman''s touch."<br>  "I''ll think about it," you answer shyly.<br>  The thought of cleaning Vitek''s place in a skimpy little outfit bubbles up in your mind, and you turn away blushing.'
+		if vitek_textb = 0: $vitek_textb = '"Any chance I could get you to come over and do some cleaning? My apartment is such a wreck that it''s virtually uninhabitable. It could really use a woman''s touch."<br>	"I''ll think about it," you answer shyly.<br>  The thought of cleaning Vitek''s place in a skimpy little outfit bubbles up in your mind, and you turn away blushing.'
 		if vitek_textb = 1 and SchoolAtestat = 0: $vitek_textb = 'Vitek flexes his bicep, and tells you to feel it. Somewhat hesitantly, you give his muscle a little squeeze. It''s hard as a rock, and a little exciting too.<br> "I can bench 300," he boasts.<br>  You have no idea what that means, but smile anyway. "Wow, that''s really good. I''m impressed."'
 		if vitek_textb = 1 and SchoolAtestat = 1: $vitek_textb = 'Vitek compliments you. "<<$pcs_nickname>>, your hair looks beautiful. I''ve always had a thing for girls with <<$pcs_haircol>> hair."<br> "Thank you," you reply while blushing.'
 		if vitek_textb = 2: $vitek_textb = 'Vitek invites you to the community center at night to drink and dance with him. The thought of dancing with him sends a little flutter though your chest.<br> "I might just take you up on that offer," you tell him, trying your best to sound sexy.'
 		if vitek_textb = 3: $vitek_textb = 'Vitek talks to you about his boxing training at that community center. He thinks he''s getting pretty good. "Stop by if you want to see me in action. There''s plenty of other stuff to do there too."'
-		if vitek_textb = 4: $vitek_textb = '"Do you ever go down to the lake to swim?" Vitek asks.<br> "Sometimes, but it''s been a while," you answer.<br>  "It''s a shame I''ve never seen you in a bathing suit," he says almost shyly.'
+		if vitek_textb = 4: $vitek_textb = '"Do you ever go down to the lake to swim?" Vitek asks.<br> "Sometimes, but it''s been a while," you answer.<br>	 "It''s a shame I''ve never seen you in a bathing suit," he says almost shyly.'
 		if vitek_textb = 5: $vitek_textb = '"I had to kick the shit out of that Igor kid after the dance a few weeks ago. You should steer clear of that guy, <<$pcs_nickname>>. I don''t like the way he treats women."'
 		if vitek_textb = 6: $vitek_textb = 'Vitek must have been boxing today as his shoulders look tense. Trying to be helpful, you walk up behind him and start giving them a good rub.<br>  "Oh <<$pcs_nickname>>, your hands feel great..." he sighs in appreciation.'
 		if vitek_textb = 7: $vitek_textb = 'You notice Vitek''s beer is almost empty. Thinking this looks like a job you can handle, you go to the kitchen to get him a fresh one. You return just as he''s ready for another and hand him it while smiling.<br> "Thanks <<$pcs_nickname>>, you read my mind," he says. His hand grazes your hip when he takes his beer, sending butterflies through your stomach.'
 
 		vitek_textb_gorslut = rand(0,7)
 		if vitek_textb_gorslut = 0: $vitek_textb_gorslut = 'You''re lying on the couch when Vitek sits down and puts your feet in his lap. Without saying anything, he gently starts to massage them. You let him know how good it feels with a series of soft moans. Vitek can be so good to you when he wants to be; you think you should probably reward him.'
-		if vitek_textb_gorslut = 1: $vitek_textb_gorslut = 'Vitek imparts some wisdom. "You can determine how close your relationship is with someone by how much you can mock them before receiving a beating."<br>  "What if I said you have a tiny cock?" you say.<br>  "Then I would attack you," he says. He takes both hands and furiously tickles you around your sides and stomach.<br>  You squeal with delight, laughing until you''re out of breath.'
+		if vitek_textb_gorslut = 1: $vitek_textb_gorslut = 'Vitek imparts some wisdom. "You can determine how close your relationship is with someone by how much you can mock them before receiving a beating."<br>  "What if I said you have a tiny cock?" you say.<br>  "Then I would attack you," he says. He takes both hands and furiously tickles you around your sides and stomach.<br>	 You squeal with delight, laughing until you''re out of breath.'
 		if vitek_textb_gorslut = 2: $vitek_textb_gorslut = 'Vitek is full of fun facts. "Did you know that it''s empirically proven that 95% of girls can no longer pronounce the name of the city Naberezhnye Cheln if they go a month without sex?"<br>  Deadpan, you respond "I speak seven languages."'
 		if vitek_textb_gorslut = 3 and SchoolAtestat = 0 and soniaPS = 1: $vitek_textb_gorslut = '"Sonia pulled me into the school toilet yesterday, climbed on top of me, and used me for sex. She basically raped me. I may have to go see the therapist at the clinic to get over it."<br>  He says it with a smile, but you can tell he''s worried about Sonia.'
 		if vitek_textb_gorslut = 3 and SchoolAtestat = 1 and soniaPS = 1: $vitek_textb_gorslut = '"Sonia was pestering me in the park yesterday. When I told her no and walked away, she just followed me. I decided I''d had enough, and started to jog away, but she chased me! She actually chased me though the park trying to have sex with me..." He just shakes his head dumbfounded by this turn of events.'
 		if vitek_textb_gorslut = 3 and soniaPS <= 0: $vitek_textb_gorslut = '"If you ever lend money to nerdy Natasha, then don''t expect to get it back. Well, not in cash anyway. Her methods of repayment are very interesting though..."<br>  You give him a playful slug on the shoulder, and start thinking about Natasha''s legs.'
 		if vitek_textb_gorslut = 4: $vitek_textb_gorslut = 'Vitek starts talking like he''s telling a ghost story. "There''s a woman who walks our quiet streets at night wearing leather and brandishing a whip. They say if she catches you, you wind up in her dungeon, never to be seen again." He finishes by laughing and making spooky sounds.<br>  You''re too distracted by thoughts of mysterious leather clad women to laugh with him.'
-		if vitek_textb_gorslut = 5: $vitek_textb_gorslut = '"What''s your favorite thing about a penis?" Vitek asks.<br>  "They always stand up when a fine lady like myself enters the room," you answer back.<br>  Vitek bursts out laughing, and starts tickling your sides.'
-		if vitek_textb_gorslut = 6: $vitek_textb_gorslut = '"Drunk girls might as well call their pussy mistress. They can think of nothing but obeying its wishes," Vitek says.<br>  You parry: "Yeah, and guys should call their cocks sir. They follow every order like it''s a life and death mission issued by their commanding officer."<br>  You both burst out laughing when Vitek gives his crotch a salute.'
-		if vitek_textb_gorslut = 7: $vitek_textb_gorslut = 'Vitek tells a joke. <br> A man walks into a pharmacy and loudly declares: "I''ll have a pack of condoms, please!"<br>  The cute young clerk blushed and whispered: "Sir, this sort of thing should be asked for in the ear, not..."<br>  "What about ears? I don''t need them for me ears! I need them for my dick!"'
+		if vitek_textb_gorslut = 5: $vitek_textb_gorslut = '"What''s your favorite thing about a penis?" Vitek asks.<br>  "They always stand up when a fine lady like myself enters the room," you answer back.<br>	 Vitek bursts out laughing, and starts tickling your sides.'
+		if vitek_textb_gorslut = 6: $vitek_textb_gorslut = '"Drunk girls might as well call their pussy mistress. They can think of nothing but obeying its wishes," Vitek says.<br>  You parry: "Yeah, and guys should call their cocks sir. They follow every order like it''s a life and death mission issued by their commanding officer."<br>	You both burst out laughing when Vitek gives his crotch a salute.'
+		if vitek_textb_gorslut = 7: $vitek_textb_gorslut = 'Vitek tells a joke. <br> A man walks into a pharmacy and loudly declares: "I''ll have a pack of condoms, please!"<br>  The cute young clerk blushed and whispered: "Sir, this sort of thing should be asked for in the ear, not..."<br>	 "What about ears? I don''t need them for me ears! I need them for my dick!"'
 		if bazar_count_vitek <= 0: '"That''s enough talk for now, <<$pcs_nickname>>," he says.'
 		if fame['pav_slut'] < 150 and bazar_count_vitek > 0: '<<$vitek_textb>>'
 		if fame['pav_slut'] >= 200 and bazar_count_vitek > 0: '<<$vitek_textb_gorslut>>'
@@ -771,7 +771,7 @@ if $ARGS[0] = 'vasily_bazar_day':
 	if shulga_lern_count > 0 and SchoolAtestat = 0:
 		act 'Do homework': gt 'vasilyhome', 'vasily_lern'
 	end
-	act 'Ask for some alcohol': 
+	act 'Ask for some alcohol':
 		'Vasily gets up and comes back with a bottle of cold vodka from the refrigerator. He takes a big swig of it before passing it to you.'
 		act 'Take the bottle': gt 'vasilyhome', 'vasily_vodka'
 	end
@@ -801,13 +801,13 @@ if $ARGS[0] = 'vasily_bazar_day':
 end
 
 if $ARGS[0] = 'vasily_rep':
-    if npc_rel['A11'] < 50:
-        'You have known Vasily since childhood.'
-    elseif npc_rel['A11'] >= 50 and npc_rel['A11'] < 100:
-        'You are good friends with Vasily.'
-    else
-        'Vasily is your very close friend.'
-    end
+	if npc_rel['A11'] < 50:
+		'You have known Vasily since childhood.'
+	elseif npc_rel['A11'] >= 50 and npc_rel['A11'] < 100:
+		'You are good friends with Vasily.'
+	else
+		'Vasily is your very close friend.'
+	end
 end
 
 if $ARGS[0] = 'vasily_vodka':
@@ -1007,6 +1007,7 @@ if $ARGS[0] = 'bathroom':
 	*nl
 	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec: gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh < 1,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and a bathtub.'
 	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	act 'Leave the bathroom': gt 'vasilyhome', 'hallway'
 	act 'Take a shower':
 		*clr & cla
 		menu_off = 1
@@ -1026,7 +1027,6 @@ if $ARGS[0] = 'bathroom':
 	dynamic $tampon
 	dynamic $basin
 	gs 'din_van', 'prvt_pee'
-	act 'Leave the bathroom': gt 'vasilyhome', 'hallway'
 end
 
 if $ARGS[0] = 'sonia_sex':
@@ -1088,6 +1088,8 @@ end
 
 
 if $ARGS[0] = 'vasilykitchen':
+	$loc = 'vasilyhome'
+	$loc_arg = 'vasilykitchen'
 	$menu_loc = 'vasilyhome'
 	$menu_arg = 'vasilykitchen'
 	menu_off = 0
@@ -1292,7 +1294,7 @@ if $ARGS[0] = 'vasily_room':
 	'<center><h4><font color="maroon">Vasily''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vasily_room.jpg"></center>'
 	'There is a dresser and small desk on one side of the room, with posters of bands and naked women along the walls. It''s a messy room, and you can barely see the floor under all the clothes laying around. You can''t tell if they''re dirty or clean, not to mention the room smells of stale sweat, weed, stale beer and maybe a hint of urine.'
-	if hour >= 0 and hour < 7: 
+	if hour >= 0 and hour < 7:
 		'<a href="exec: gt ''vasilyhome'', ''vasily_asleep''">Vasily</a> is sleeping on his narrow bed'
 	else
 		'A narrow <a href="exec:gt ''vasilyhome'',''vasily_bed''">bed</a> is against the other wall.'
@@ -1326,7 +1328,7 @@ if $ARGS[0] = 'sleep_vasily_bed':
 	act 'Get up': gt 'vasilyhome', 'vasily_room'
 	gs 'stat'
 end
-	
+
 if $ARGS[0] = 'vasily_asleep':
 	menu_off = 1
 	*clr & cla