Merge remote-tracking branch 'origin/master'

locations/katja_dorm.qsrc

@@ -5,88 +5,67 @@
 
 
 if $ARGS[0] = 'start':
-	$loc      = 'katja_dorm'
-	$loc_arg  = 'start'
+	$loc = 'katja_dorm'
+	$loc_arg = 'start'
 	$menu_loc = 'katja_dorm'
 	$menu_arg = 'start'
 	$locclass = 'livingr'
 	$location_type = 'indoors'
 	CLOSE ALL
 	menu_off = 0
-
 	gs 'katja_meynold_schedule'
 	gs 'stat'
-
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> ''S Dorm Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/dorm_room.jpg"></center>'
 	'The dorm room has two beds. The one on the left belongs to '+iif( sofiaQW['know'] = 0, 'Katja''s room mate', 'Sofia')+' while the one on the right is Katja''s. Above Katja''s bed is a full bookcase, and the wall is plastered with posters and notes.'
 	'Her table is likewise full of stuff; in the middle of it sits her laptop. '+iif( sofiaQW['know'] = 0, 'Her room mate''s', 'Sofia')+' side of the room is a lot less cluttered.'
-
 	if locat['katja'] = 31:
 		'Katja is sitting at her desk.'
 		act 'Talk to Katja': gt 'katja_dorm', 'talk'
-
 	elseif locat['katja'] = 20:
 		'Katja is asleep, so you should not disturb her.'
-
 	elseif locat['katja'] = 22:
 		'Katja is getting dressed and doing her makeup. She doesn''t want to be disturbed right now.'
-
 	elseif locat['katja'] = 24:
 		if minut < 50:
 			'Katja is preparing to go to class, collecting the things she needs.'
 			act 'Talk to Katja': gt 'katja_chat', 'chat'
-
 		else
 			'Katja is heading out the door to class and has no time to talk.'
 		end
-
 	elseif locat['katja'] = 35:
 		'Katja is moving around getting dressed up, seemingly preparing for a night out.'
 		act 'Talk to Katja': gt 'katja_party', 'going_out'
-
 	elseif locat['katja'] = 51:
 		'Katja is moving around the room while setting up her laptop.'
 		act 'Talk to Katja': gt 'katja_dorm', 'movie_talk1'		
-
 	elseif locat['katja'] = 52:
 		'Katja is sitting on her bed, having set up her laptop so she can watch a film.'
 		act 'Talk to Katja': gt 'katja_dorm', 'movie_talk2'	
-
 	else
 		'Katja is not in her room.'
 	end
-
 	act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 end
 
-
-
 if $ARGS[0] = 'talk':
 	menu_off = 1
 	gs 'katja_meynold_schedule'
 	gs 'stat'
-
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-
 	if katjaQW['QWstage'] > 2:
 		if katjaQW['horny'] < 20:
 			'Katja looks calm and stoic.'
-
 		elseif katjaQW['horny'] < 40:
 			'Katja looks at you with a naughty twinkle in her eyes.'
-
 		elseif katjaQW['horny'] < 60:
 			'Katja looks at you with a faint blush as she smiles at you mischievously.'
-
 		elseif katjaQW['horny'] < 80:
 			'Katja is blushing fairly obviously and looks at you longingly.'
-
 		else
 			'Katja''s face is flushed bright red, and her chest is heaving from her heavy breathing. She''s idly rubbing her thighs against one another.'
 		end
-
 	else
 		'Katja looks at you with a smile.'
 	end
@@ -101,17 +80,14 @@ if $ARGS[0] = 'talk':
 			!! Katja wants to go to bed and shows you out
 			'"I''m off to bed now. Talk another time?" Katja asks as she shows you out.'
 			act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
-
 		elseif locat['katja'] = 29:
 			!! Katja wants to go to the library to study
 			'"I need to do some studying at the library. Care to join me?" Katja asks.'
 			if week = 4:
 				if npc_sex['A14'] >= 1:
 					gs 'willpower', 'misc', 'force', 'easy'
-
 				elseif katjaQW['slut'] < 50:
 					gs 'willpower', 'misc', 'force', 'hard'
-
 				else
 					gs 'willpower', 'misc', 'force'
 				end
@@ -124,69 +100,55 @@ if $ARGS[0] = 'talk':
 						locat['katja_rand2'] = daystart
 						locat['katja_save2'] = locat['katja']
 						minut += 10
-
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 						'"Come on, let''s watch a movie instead! You can always study tomorrow . Why do you even need to study anyway? You''re so smart that you know everything!" you say.' 
 						'"That''s not true. I only do so well in class because I study a lot," Katja answers.' 
 						'"Please?" you plead, trying to make puppy eyes at Katja, who has a hard time not laughing.' 
 						'"Okay, just this once." she finally relents. "Go prepare some popcorn while I set up my laptop."'
 						'You go to the kitchen and prepare the popcorn before you both settle down on her bed and watch the film Katja has selected.'
-
 						act 'Watch the movie': gt 'katja_dorm', 'watch_movie'
 					end
-
 				else
 					act 'Convince Katja to stay here and watch a movie (<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 'Go to the library with Katja': minut += 10 & gt 'katja_uni', 'library2' 
 			act 'Say no and leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
-
 		elseif locat['katja'] = 37:
 			gt 'katja_party', 'going_out_talk'
-
 		elseif locat['katja'] = 51:
 			gt 'katja_dorm', 'movie_talk1'
-
 		elseif locat['katja'] = 52:
 			gt 'katja_dorm', 'movie_talk2'
-
 		else
 			!!If Katja is not doiing any of the above activities then she just shows you out.
 			'"Sorry, but I have to run now. See you later," she says.'
 			act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 		end
-
 	else
 		if (katjaQW['lazer_pussy_talk'] = 0 or (katjaQW['lazer_pussy_talk'] = 2 and katjaQW['knows_sex'] = 1 and rand(0,4) = 0)) and katjaQW['lazer_pussy'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and katjaQW['lazar_uni_meet'] = 1 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
 			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have sex with him, provided they have not already done so before.
 			gt 'Katja_dorm', 'lazar_pussy_talk'
-
 		else
 			if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and katjaQW['sex_clossedness'] = 0:
 			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
 				gt 'Katja_dorm', 'lazar_anal_talk'
-
 			else
 				if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and katjaQW['boy_block'] = 0 and min(katjaQW['horny'],100) > rand(40,160)) and katjaQW['sex_clossedness'] < 2:
 					if katjaQW['lazer_anal'] + katjaQW['lazer_pussy'] >= 2 and katjaQW['lazar_day'] ! daystart and rand(0,6) = 0 and katjaQW['sex_clossedness'] = 0:
 						!! Katja want to have a threesome with Lazar
 						gt 'katja_dorm', 'lazar_kiss'
-
 					elseif katjaQW['QWstage'] > 2:
 						!!The standard start of her sex scenes at home.
 						gt 'KatjaHomeTalk', 'hornykiss'
-
 					else
 						!!This only triggers if the player have never kissed Katja.
 						gt 'KatjaHomeTalk', 'tender_kiss'
 					end
-
 				else
 					if katjaQW['coke_day_ask'] ! daystart and katjaQW['coke_day'] ! daystart and rand(6,12) <=  katjaQW['coke_stage']:
 						!! Katja want to do cocaine
 						gt 'katja_dorm',  'cocain_offer'
-
 					else
 						if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
 							!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
@@ -199,7 +161,6 @@ if $ARGS[0] = 'talk':
 								'"You''re pregnant again?" Her face turns red, and she glares at you with an intensity you''ve never seen before. "After everything, you still didn''t trust me enough to tell me?"'
 								'You try to speak up, but she folds her arms and turns her back to you.'
 								'"I thought there was something special between us..." Something wet glistens on her cheek, which she wipes away dismissively. "Get out. I don''t want to see you right now."'
-
 							elseif knowKatjaPreg = 1:
 								cla
 								gs 'stat'
@@ -207,7 +168,6 @@ if $ARGS[0] = 'talk':
 								KatjaConflict = 1
 								KatConCheck = daystart
 								'"Are you pregnant?" Katja looks at you, betrayal in her eyes. "Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
-
 							else
 								cla
 								*nl
@@ -215,9 +175,8 @@ if $ARGS[0] = 'talk':
 								KatjaConflict = 1
 								KatConCheck = daystart
 								'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
-								end
-						act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
-
+							end
+							act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 						else
 							!!If no events triggers they you go to the part where the player can choose things to do with Katja.
 							gt 'katja_dorm', 'chat'
@@ -241,7 +200,6 @@ if $ARGS[0] = 'chat':
 	!!This is what gives the different option for the player to talk with Katja about.
 	'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-
 	if katjaQW['QWstage'] > 2 and katjaQW['sex_clossedness'] < 2:
 		if katjaQW['horny'] < 20:
 			'Katja looks calm and stoic.'
@@ -268,7 +226,6 @@ if $ARGS[0] = 'chat':
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-
 		if (rand(0,100) > katjaQW['horny'] + min(katjaQW['slut']/2,50)) or katjaQW['sex_clossedness'] = 2:
 			!!If Katja is horny she will talk about sex, else she will talk about normal stuff. The more corrupted she is the less horny she need to be to talk about sex.
 			'Katja talks about her university subjects, cosmetics, the latest fashion trends and other things she considers very important.'
@@ -357,7 +314,6 @@ if $ARGS[0] = 'chat':
 				'Her face lights up. "Congratulations! This is even more exciting than last time! Every time you tell me you''re pregnant, I feel better about my pregnancy. Hell, that''s probably why you keep getting pregnant, isn''t it?" she giggles jokingly.'
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows1'
 			end
-
 		elseif knowKatjaPreg = 1:
 			act 'Tell her you''re pregnant':
 				cla & *clr
@@ -366,7 +322,6 @@ if $ARGS[0] = 'chat':
 				'"What?! That''s so exciting! You didn''t get pregnant to be like me?" she asks playfully.'
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows'
 			end
-
 		elseif KatjaPreg = 0:
 			act 'Tell her you''re pregnant':
 				cla & *clr
@@ -423,13 +378,10 @@ if $ARGS[0] = 'chat':
 	end
 end
 
-
-
 if $ARGS[0] = 'sofia_meet':
 	minut += 3
 	sofiaQW['know'] = 1
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
 	'Just as you''re about to leave, the door opens and a girl walks in.'
 	'"Hi, Katja! I''m home early since Maxim suddenly had a meeting with one of his professors. I swear that he''s doing so much to study hard; almost too much. Always trying to meet with his teachers. I told him that they might see it as..." She suddenly stops, having noticed you. "Oh, you have a guest."'
@@ -442,12 +394,9 @@ if $ARGS[0] = 'sofia_meet':
 	'"That''s right, I''ll be leaving now," you say.'
 	'"Nice meeting you," Sofia says. "Wish we had more time to chat since I barely know anybody here; just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
 	'You say goodbye to Katja and as you leave the room, you hear Sofia continuing to talk the ear off of Katja.'
-
 	act 'Leave': gt 'uni_dorm', 'second_floor'
 end
 
-
-
 if $ARGS[0] = 'lazar_pussy_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['pussy_sex'] > 0 and katjaQW['QWstage'] < 6:
@@ -471,7 +420,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					'"I made myself clear the last time we talked about this, and my answer has not changed," you tell her. It''s clear that Katja is not happy about your response.'
 					act 'Talk about something else': gt 'katja_dorm', 'talk'
 				end
-
 			elseif katjaQW['QWstage'] = 5:
 				'"We agreed that you would help me try to have... vaginal sex... with a guy," Katja says with some pause. "Maybe that guy could be Lazar?"'
 				act 'Agree':
@@ -488,7 +436,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 					act 'Talk about something else': gt 'katja_dorm', 'talk'
 				end
-
 			else
 				katjaQW['QWstage'] = 4
 				if katjaQW['knows_sex'] = 1:
@@ -503,7 +450,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						katjaQW['lazer_pussy_talk'] = 2
 						gt 'katja_dorm', 'lazar_refuse', 'pussy'
 					end
-
 				else
 					'"Have you ever..." she continues.'
 					'"Have I ever what?" you ask.'
@@ -523,7 +469,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								gt 'katja_dorm', 'lazar_refuse', 'pussy'
 							end
 						end
-
 					else
 						if npc_sex['A149'] > 0:
 							act 'Tell her you''ve fucked Lazar before':
@@ -541,7 +486,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 									gt 'katja_dorm', 'lazar_refuse', 'pussy'
 								end
 							end
-
 						else
 							act 'Tell her you''ve had sex before':
 								cla
@@ -563,7 +507,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					act 'Tell Katja you''re not interested in guys': gt 'KatjaHomeTalk', 'boy_no'
 				end
 			end
-
 		else
 			if katjaQW['QWstage'] < 6:
 				'"You know, <<$pcs_nickname>>, meeting Lazar at the cafe got me thinking," Katja says.'
@@ -580,7 +523,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						'"I made myself clear last time, and that''s not changed," you tell her. That is something she''s not completely happy with.'
 						act 'Talk about something else': gt 'katja_dorm', 'talk'
 					end
-
 				elseif katjaQW['QWstage'] = 5:
 					'"We have agreed that you would help me to try having... vaginal sex... with a guy," Katja says with some pause. "Maybe that guy could be Lazar?"'
 					act 'Agree':
@@ -597,7 +539,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 						act 'Talk about something else': gt 'katja_dorm', 'talk'
 					end
-
 				else
 					katjaQW['QWstage'] = 4
 					if katjaQW['knows_sex'] = 1:
@@ -611,7 +552,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 							katjaQW['lazer_pussy_talk'] = 2
 							gt 'katja_dorm', 'lazar_refuse', 'pussy'
 						end
-
 					else
 						'"We''ve had anal sex with a guy, but have you ever had vaginal sex with one?" she continues.'
 						if stat['vaginal'] = 0:
@@ -629,7 +569,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 									gt 'katja_dorm', 'lazar_refuse', 'pussy'
 								end
 							end
-
 						else
 							if npc_sex['A149'] > 0:
 								act 'Tell her you''ve fucked Lazar before':
@@ -647,7 +586,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 										gt 'katja_dorm', 'lazar_refuse', 'pussy'
 									end
 								end
-
 							else
 								act 'Tell her you''ve had sex before':
 									cla
@@ -669,7 +607,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						act 'Tell Katja you''re not interested in guys': gt 'KatjaHomeTalk', 'boy_no'
 					end
 				end
-
 			else
 				'"You know <<$pcs_nickname>>, when we talked with Lazar at the café, he seemed really into us," Katja says. "Maybe we should call him and see if he''s up to having some fun with us?"'
 				act 'Agree':
@@ -693,7 +630,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				end
 			end
 		end
-
 	else
 		if katjaQW['lazer_pussy_talk'] = 2:
 			'"I know you said earlier that you didn''t want to have vaginal sex with Lazar'+iif(katjaQW['lazer_anal'] > 0, ', but we''ve had anal sex with him; ', ' ')+'so would you please reconsider? I really want to try with a guy, and I want you to be there. Please?" Katja pleads, looking at you with her big eyes.'
@@ -707,7 +643,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				'"I made myself clear the last time you asked and that hasn''t changed," you tell her. She doesn''t plead her case, but she doesn''t seem satisfied.'
 				act 'Talk about something else': gt 'katja_dorm', 'talk'
 			end
-
 		else
 			if katjaQW['lazer_anal_talk'] + katjaQW['lazer_anal'] > 0:
 				katjaQW['lazer_pussy_talk'] = 1
@@ -721,7 +656,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						'"So you want to also have vaginal sex with him?" you ask.'
 						'"We''ve had vaginal sex with other boys, so why not him as well?" she replies.'
 					end
-
 				else
 					if katjaQW['QWstage'] < 4: katjaQW['QWstage'] = 4
 					'"I''ve never had vaginal sex with a guy," you tell Katja.'
@@ -735,7 +669,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					katjaQW['lazer_pussy_talk'] = 2
 					gt 'katja_dorm', 'lazar_refuse', 'pussy'
 				end
-
 			else
 				gt 'katja_dorm', 'chat'
 			end
@@ -743,8 +676,6 @@ if $ARGS[0] = 'lazar_pussy_talk':
 	end
 end
 
-
-
 if $ARGS[0] = 'lazar_refuse':
 	minut = +5
 	gs 'stat'
@@ -781,8 +712,6 @@ if $ARGS[0] = 'lazar_refuse':
 	end
 end
 
-
-
 if $ARGS[0] = 'lazar_agree':
 	minut = +5
 	gs 'stat'
@@ -790,7 +719,6 @@ if $ARGS[0] = 'lazar_agree':
 	if katjaQW['QWstage'] = 5:
 		'"Okay. We should let Lazar be '+iif(stat['vaginal'] >0, 'your', 'our')+' first guy," you agree.'
 		'Katja looks a little embarrassed, but has a naughty gleam in her eyes.'
-
 	elseif katjaQW['QWstage'] > 5:
 		'"Okay. '+iif(katjaQW['ivan_anal'] + katjaQW['marcus_pussy'] + katjaQW['marcus_anal'] >0, 'We can include Lazar in our harem of hot guys',  'We Having a threesome with Lazar do sounds fun')+'" you say, which causes Katja to start laughing.'
 		'When she stops, she looks very excited. "Great. I want his cock in my pussy!"'
@@ -800,18 +728,15 @@ if $ARGS[0] = 'lazar_agree':
 			if katjaQW['QWstage'] > 5:
 				'"And we''ll let him fuck our butts, like we said earlier?" Katja asks.'
 				'"Of course. We already agreed to that," you answer.'
-
 			else
 				'"Okay. We should let Lazar be the first guy to fuck '+iif(stat['anal'] >0, 'your', 'our')+' ass," you agree.'
 				'Katja looks a little embarrassed, but has a naughty gleam in her eyes.'
 			end
-
 		else
 			katjaQW['lazer_anal_talk'] = 1
 			'"And we''ll let him fuck our butts, like we talked about getting somebody to do earlier?" Katja asks.'
 			'"We could get him to do that if he wants to," you answer.'
 		end
-
 	elseif katjaQW['anal_quest'] = 3:
 		if katjaQW['QWstage'] > 5:
 			katjaQW['lazer_anal_talk'] = 1
@@ -824,10 +749,8 @@ if $ARGS[0] = 'lazar_agree':
 	end
 	if katjajQW['slut'] > 60 and katjaQW['anal_quest'] = 0:
 		act 'Katja has something more to say': gt 'Katja_dorm', 'lazar_anal_talk'
-
 	elseif katjajQW['slut'] > 50 and  katjaQW['QWstage'] < 5:
 		act 'Katja has something more to say': gt 'Katja_dorm', 'lazar_pussy_talk'
-
 	else
 		act 'Call Lazar':
 			cla & *clr
@@ -837,13 +760,12 @@ if $ARGS[0] = 'lazar_agree':
 			'"I''m always ready for some fun," he says. "What kind of fun do you have in mind?"'
 			if katjaQW['QWstage'] = 5:
 				if katjaQW['anal_quest'] = 2:
-					'"Well ' + iif(stat['vaginal'] > 0, 'Katja has a pussy', 'we have pussies') + ' and ' + iif(stat['anal']> 0, 'Katja has a butt', 'we have butts') + ' that have never tried a cock, and thought that you would be the man for doing something about it?" you say.'
+					'"Well '+iif(stat['vaginal'] > 0, 'Katja has a pussy', 'we have pussies')+' and '+iif(stat['anal']> 0, 'Katja has a butt', 'we have butts')+' that have never tried a cock, and thought that you would be the man for doing something about it?" you say.'
 				else
-					'"Well ' + iif(stat['vaginal'] > 0, 'Katja has a pussy that has', 'we have pussies that have') + ' never tried a cock, and thought that you would be the man for doing something about it?" you say.'
+					'"Well '+iif(stat['vaginal'] > 0, 'Katja has a pussy that has', 'we have pussies that have')+' never tried a cock, and thought that you would be the man for doing something about it?" you say.'
 				end
 				'You hear Lazar gasp at your brazenness and see Katja''s face turning completely red.'
 				'After getting himself together, he answers, "Of course, I am the right man for that. Come on over."'
-
 			else
 				if katjaQW['anal_quest'] = 2:
 					'"Well, ' + iif( stat['anal'] > 0, 'Katja has a butt that has', 'we have butts that have') + ' never tried a cock, and thought that you would be the man for doing something about that?" you say.'
@@ -862,8 +784,6 @@ if $ARGS[0] = 'lazar_agree':
 	end
 end
 
-
-
 if $ARGS[0] = 'lazar_anal_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['anal_sex'] > 0 and katjaQW['anal_quest'] < 3:
@@ -887,7 +807,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 					'"I made myself clear last time and that hasn''t changed," you tell her. She''s not completely happy.'
 					act 'Talk about something else': gt 'katja_dorm', 'talk'
 				end
-
 			else
 				katjaQW['anal_quest'] = 1
 				if katjaQW['knows_anal'] = 1:
@@ -901,7 +820,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 						katjaQW['lazer_anal_talk'] = 2
 						gt 'katja_dorm', 'lazar_refuse', 'anal'
 					end
-
 				else
 					'"Have you ever..." she continues.'
 					'"Have I ever what?" you ask.'
@@ -921,7 +839,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 								gt 'katja_dorm', 'lazar_refuse', 'anal'
 							end
 						end
-
 					else
 						if npc_sex['A149'] > 0:
 							act 'Tell her you''ve fucked Lazar before':
@@ -939,7 +856,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 									gt 'katja_dorm', 'lazar_refuse', 'anal'
 								end
 							end
-
 						else
 							act 'Tell her you''ve had anal sex before':
 								cla
@@ -961,7 +877,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 					act 'Tell Katja you have no interest in boys': gt 'KatjaHomeTalk', 'boy_no'
 				end
 			end
-
 		else
 			if katjaQW['anal_quest'] < 3:
 				'"You know, <<$pcs_nickname>>, meeting Lazar at the cafe got me thinking," Katja says.'
@@ -978,7 +893,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 						'"I made myself clear last time and that hasn''t changed," you tell her. But, nevertheless, she''s not completely happy.'
 						act 'Talk about something else': gt 'katja_dorm', 'talk'
 					end
-
 				else
 					katjaQW['anal_quest'] = 1
 					if katjaQW['knows_anal'] = 1:
@@ -992,7 +906,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 							katjaQW['lazer_anal_talk'] = 2
 							gt 'katja_dorm', 'lazar_refuse', 'anal'
 						end
-
 					else
 						'"We''ve had sex with a guy, but have you ever had anal sex with one?" she continues.'
 						if stat['anal'] = 0:
@@ -1010,7 +923,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 									gt 'katja_dorm', 'lazar_refuse', 'anal'
 								end
 							end
-
 						else
 							if npc_sex['A149'] > 0:
 								act 'Tell her you''ve fucked Lazar before':
@@ -1028,7 +940,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 										gt 'katja_dorm', 'lazar_refuse', 'anal'
 									end
 								end
-
 							else
 								act 'Tell her you''ve had anal sex before':
 									cla
@@ -1050,7 +961,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 						act 'Tell Katja you''re not interested in guys': gt 'KatjaHomeTalk', 'boy_no'
 					end
 				end
-
 			else
 				'"You know, <<$pcs_nickname>>, when we talked with Lazar at the café, he seemed really into us," Katja says. "Maybe we should call him and see if he''s up for having some fun with us."'
 				act 'Agree':
@@ -1073,7 +983,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 				end
 			end
 		end
-
 	else
 		if katjaQW['lazer_anal_talk'] = 2:
 			'"I know you said earlier that you didn''t want to have anal sex with Lazar but'+iif(katjaQW['lazer_pussy'] > 0, ' we''ve had vaginal sex with him, so ', ' ')+'would you please reconsider? I really want to try anal with a guy, and I want you to be there. Please?" Katja pleads, looking at you with her big eyes,'
@@ -1088,11 +997,9 @@ if $ARGS[0] = 'lazar_anal_talk':
 				'"I made myself clear the last time you asked and that hasn''t changed," you tell her. She doesn''t plead her case, but she doesn''t seem satisfied.'
 				act 'Talk about something else': gt 'katja_dorm', 'talk'
 			end
-
 		else
 			if katjaQW['lazer_pussy_talk'] + katjaQW['lazer_pussy'] <= 0:
 				gt 'katja_dorm', 'chat'
-
 			else
 				katjaQW['lazer_anal_talk'] = 1
 				'"You know we have '+iif(katjaQW['lazer_pussy'] = 0, 'talked about', 'had')+' sex with Lazar," Katja says. "Maybe we could also have... anal sex with him?" she continues.'
@@ -1104,7 +1011,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 						'"So you want to also have anal sex with him?" you ask.'
 						'"We have anal sex with other guys, so why not him too?" she answers.'
 					end
-
 				else
 					if katjaQW['anal_quest'] < 2: katjaQW['anal_quest'] = 2
 					'"I''ve never had anal sex with a guy," you tell Katja.'
@@ -1123,8 +1029,6 @@ if $ARGS[0] = 'lazar_anal_talk':
 	end
 end
 
-
-
 if $ARGS[0] = 'lazar_kiss':
 	*clr & cla
 	minut += 5
@@ -1144,20 +1048,17 @@ if $ARGS[0] = 'lazar_kiss':
 					'You tell Lazar that you''ll come over, and when you turn back towards Katja, she''s holding something in her hands. "Look what I have," she says and shows you two almost identically black bodysuits.'
 					'"I think it would be sexy if we were these matching bodysuits," she says. You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
 					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
-
 				else
 					'Katja suddenly looks nervous when you tell her that Ivan is at Lazar''s place. "I... I don''t think... I think .... It''s best if we wait for another time. I''m not ready for two guys at the same time."'
 					'You accept Katja''s decision and tell Lazar that you won''t be coming over. He''s a little disappointed, but tells you to call him another time.'
 					act 'Continue': gt 'katja_dorm', 'talk'
 				end
-
 			else
 				minut += 5
 				'Katja readily agrees to also include Ivan in the fun and you tell Lazar you''ll come over. Katja then runs to her drawer and pulls out the black bodysuits you wore last time and suggests you do it again since it seemed to turn the boys on.'
 				'You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
 				act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
 			end
-
 		else
 			'You call him, and he quickly agrees to have you over.'
 			act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
@@ -1166,8 +1067,6 @@ if $ARGS[0] = 'lazar_kiss':
 	act 'You''re not in the mood': katjaQW['horny'] -= 20 & gt 'katja_dorm', 'talk'
 end
 
-
-
 if $ARGS[0] = 'movie_talk1':
 	cla & *clr
 	menu_off = 1
@@ -1193,16 +1092,13 @@ if $ARGS[0] = 'movie_talk1':
 			'"Why don''t we go out partying instead? It''ll be fun" you say.'
 			if katjaQW['horny'] >= 100:
 					gs 'willpower', 'misc', 'force', 'easy'
-
 			elseif katjaQW['horny'] < 50:
 					gs 'willpower', 'misc', 'force', 'hard'
-
 			else
 				gs 'willpower', 'misc', 'force'
 			end
 			if week = 4 and university['exam_week'] = 1:
 				'"No. Not tonight. I need to be fresh so I can study tomorrow. I want to do well on my exam, so not tonight" Katja says.'
-
 			else
 				'"I don''t know. I''m not sure I''m up for it tonight. I really want to watch this movie." Katja answers.'
 				if will_cost <= pcs_willpwr:		
@@ -1246,8 +1142,6 @@ if $ARGS[0] = 'movie_talk1':
 	end
 end
 
-
-
 if $ARGS[0] = 'movie_talk2':
 	cla & *clr
 	menu_off = 1
@@ -1267,8 +1161,6 @@ if $ARGS[0] = 'movie_talk2':
 	end
 end
 
-
-
 if $ARGS[0] = 'watch_movie':
 	if katjaQW['relationship_cont_start'] + 350/(1+ katjaQW['boy_block']) < daystart and hour < 21 and katjaQW['relationship_talk'] = 0:
 		gt 'katja_dorm', 'relationship_talk'
@@ -1403,8 +1295,6 @@ if $ARGS[0] = 'watch_movie':
 	end
 end
 
-
-
 if $ARGS[0] = 'after_movie_strip1':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie1.jpg"></center>'
@@ -1424,8 +1314,6 @@ if $ARGS[0] = 'after_movie_strip1':
 	end
 end
 
-
-
 if $ARGS[0] = 'after_movie_strip2':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/dorm/after_movie3.jpg"></center>'
@@ -1445,15 +1333,12 @@ if $ARGS[0] = 'after_movie_strip2':
 	end
 end
 
-
-
 if $ARGS[0] = 'relationship_talk':
 	locat['katja_save2'] = 20
 	menu_off = 1
 	katjaQW['relationship_talk'] = 1
 	if hour < 20: 
 		minut += 210
-
 	else
 		minut += 190
 	end
@@ -1473,7 +1358,7 @@ if $ARGS[0] = 'relationship_talk':
 		act 'Stop having sex <br><font color="red">(Sex with Katja will no longer be a option)</font>':
 			cla & *clr
 			katjaQW['sex_clossedness'] = 2
-			katjaQW['liberated'] = 1
+			if katjaQW['liberated'] = 0: katjaQW['liberated'] = 1
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'	
@@ -1484,7 +1369,7 @@ if $ARGS[0] = 'relationship_talk':
 		act 'Friends with benefits':
 			cla & *clr
 			minut += 5
-			katjaQW['liberated'] = 1
+			if katjaQW['liberated'] = 0: katjaQW['liberated'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'"Sure, and it''s fun. I want to continue doing that. We are what you call ''friends with benefits''," you tell her.'
@@ -1507,7 +1392,6 @@ if $ARGS[0] = 'relationship_talk':
 		'"Yes... Yes, I would love that," Katja replies, still looking thoughtful but now with a smile on her face.'  
 		if katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >=3 or katjaQW['simultanous_girls'] > 1:
 			'"But we have also had sex with other '+iif(katjaQW['boy_block'] = 1, 'girls', 'people')+'. How does that fit with us being in a relationship?" Katja asks.'
-
 		else
 			'"So, we are now a couple. Only having sex with each other?"'
 		end
@@ -1515,6 +1399,7 @@ if $ARGS[0] = 'relationship_talk':
 			cla & *clr
 			katjaQW['sex_clossedness'] = 1
 			katjaQW['faithful'] = 1
+			if katjaQW['liberated'] = 1: katjaQW['liberated'] = 0
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'			
@@ -1527,6 +1412,7 @@ if $ARGS[0] = 'relationship_talk':
 		act 'OK to have sex with others but only together <br><font color="red">(Katja will expect you not to have sex with other unless she is also there)</font>':
 			cla & *clr
 			katjaQW['faithful'] = 1
+			if katjaQW['liberated'] = 1: katjaQW['liberated'] = 0
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'		
@@ -1554,8 +1440,6 @@ if $ARGS[0] = 'relationship_talk':
 	end
 end
 
-
-
 if $ARGS[0] = 'cocain_offer':
 	 katjaQW['coke_day_ask'] = daystart
 	 minut += 2
@@ -1564,10 +1448,8 @@ if $ARGS[0] = 'cocain_offer':
 	'"Look what I have here" Katja says as she shows you a small plastic bag with white powder. "Why don''t we take some lines to make this more fun?" she ask.'
 	if katjaQW['coke_stage'] = 6:
 		gs 'willpower', 'drugs', 'resist', 'easy'
-
 	elseif katjaQW['coke_stage'] = 7:
 		gs 'willpower', 'drugs', 'resist'
-
 	elseif katjaQW['coke_stage'] = 8:
 		gs 'willpower', 'drugs', 'resist', 'hard'
 	end
@@ -1588,7 +1470,6 @@ if $ARGS[0] = 'cocain_offer':
 			'Katja is silently thinking about it for a moment. "Fine. You get it your way, this time," she says, clearly not happy about it, but packs the drugs away and after a few minutes she seems to have forgotten about it.'
 			act 'Continue talking': gt 'katja_dorm', 'talk'
 		end
-
 	else
 		act 'Convince Katja not to take the cocaine (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -1610,6 +1491,5 @@ if $ARGS[0] = 'cocain_offer':
 	end			
 end
 
-
 --- katja_dorm ---------------------------------
 

locations/katja_uni_sex.qsrc

@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'lazar_ivan_dp':
 			if katjaQW['slut'] < 100 or katjaQW['horny'] < 100:
 				'"No," Katja suddenly says in a firm voice. "No, there doesn''t need to be a first time, and definitely not now!"'
 				'The guys look disappointed, but understand that there might be other opportunities in the future.'
-				'"At least let me fuck your ass," Ivans says.'
+				'"At least let me fuck your ass," Ivan says.'
 				'"Okay, we can do that," she says.'
 				act 'More butt fucking':  gt 'katja_uni_sex', 'lazar_ivan_anal2'
 			else

locations/pav_pool.qsrc

@@ -8,22 +8,17 @@
 
 $loc = 'pav_pool'
 
-
 if $ARGS[0] = 'building' or $ARGS[0] = '':
 	$loc_arg = 'building'
 	$location_type = 'public_outdoors'
-
 	minut += 4
 	if hour >= 8 and hour <= 20:
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'Pavlovsk''s public swimming pool is rather dated, but still serves it''s purpose quite well.'
 		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs you 60 <b>₽</b>.'
-
 		if SchoolAtestat = 0:
 			pav_swimpool['entrancefee'] = 60
-
 		else
 			pav_swimpool['entrancefee'] = 100
 		end
@@ -31,11 +26,9 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 		if pav_swimpool['entrancepaid'] = daystart:
 			'<b>You''ve already paid the fee, so you can enter.</b>'
 			act 'Enter': gt 'pav_pool', 'entrance'
-
 		else
 			if money < pav_swimpool['entrancefee']:
 				act 'Pay and enter': '<br><font color="red">You don''t have enough money to pay for entrance!</font>'
-
 			else
 				act 'Pay and enter':
 					money -= pav_swimpool['entrancefee']
@@ -45,28 +38,20 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 				end
 			end
 		end
-
 		act 'Leave': gt 'pav_residential'
-
 	else
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'The swimming pool is currently closed. Opening hours are from 08:00 to 21:00.'
-
 		act 'Leave': gt 'pav_residential'
 	end
 end
 
-
-
 if $ARGS[0] = 'entrance':
 	minut += 2
-	
 	$loc_arg = 'entrance'
 	$location_type = 'public_indoors'
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 	'You''re currently inside the entrance to the swimming pool.'
 	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
@@ -76,54 +61,41 @@ if $ARGS[0] = 'entrance':
 	act 'Leave': gt 'pav_pool', 'building'
 end
 
-
-
 if $ARGS[0] = 'store':
 	!! Outside of the first visit. Clerk has an 80% chance of being away in the busy times and a 30% in the down times.
 	minut += 1
-
 	$loc_arg = 'store'
 	$location_type = 'public_indoors'
 
 	if pav_swimpool['storeclerkvisit'] > 0 and (( (hour >= 8 and hour <= 10) or hour >= 17) and rand(1, 10) <= 8) or rand(1, 10) <= 3:
 		gs 'stat'
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/store.jpg"></center>'
 		'The store is closed right now. The clerk must be doing janitor work somewhere.'
-
 		act 'Leave': gt 'pav_pool', 'entrance'
-
 	else
 		gs 'stat'
-
 		'<center><h3Pool Store</h3></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/store.jpg"></center>'
 		'The store is small and barely has anything on display, but they might have some swimwear available. There is a divider if you wish to try anything on, but it doesn''t seem to offer much privacy.'
 
-		!!Buy one specific swimsuit.
+		!!Buy one specific swimsuit
 		act 'Ask for swimwear':
 			if scandalicious_bikinis[46] = 1:
 				*clr & cla
 				minut += 1
 				gs 'stat'
-
 				'<center><h3>Pool Store</h3></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/storeclerk.jpg"></center>'
 				'You already own a bikini which looks similar to the one they have on sale here.'
-
 				act 'Continue': gt 'pav_pool', 'store'
-
 			else
 				gt 'pav_pool_events', 'store_simsuit_buy'
 			end
 		end
-
 		act 'Leave': gt 'pav_pool', 'entrance'
 	end
 end
 
-
-
 if $ARGS[0] = 'lockerfemale':
 	!! Clothing change events
 	!!-------------------------------------------------------------------!!
@@ -138,7 +110,6 @@ if $ARGS[0] = 'lockerfemale':
 		if PCloswimwear = 1:
 			!! Locker events nude -> swimwear
 
-
 		elseif $clothingworntype ! 'nude' or $pantyworntype ! 'none':
 			!! Locker events nude -> normal clothing
 			gt 'pav_pool_events', 'locker_nude_to_clothed'
@@ -150,7 +121,6 @@ if $ARGS[0] = 'lockerfemale':
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			!! Locker events swim -> nude
 			gt 'pav_pool_events', 'locker_swim_to_nude'
-
 		elseif PCloswimwear ! 1:
 			!! Locker events swim -> clothing
 		end
@@ -161,7 +131,6 @@ if $ARGS[0] = 'lockerfemale':
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			!! Locker events clothing -> nude
 			gt 'pav_pool_events', 'locker_clothed_to_nude'
-
 		elseif PCloswimwear = 1:
 			!! Locker events clothing -> swim
 		end
@@ -170,20 +139,19 @@ if $ARGS[0] = 'lockerfemale':
 
 
 	!!ARGS[1] = 1 prevents this event from triggering repeatedly
-	if rand(1, 10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
+	if rand(1,10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
 		gt 'pav_pool_events', 'naked_locker'
 	end
 
 	minut += 1
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/lockers.jpg"></center>'
 	'The changing rooms are old and murky. They are uncomfortable, cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only in swimwear.'
+	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
 
 	if func('changingroom','count_swim_item') > 0:
 		act 'Change your clothes':
-			!!Remember current clothes for clothing change events.
+			!!Remember current clothes for clothing change events
 			if $clothingworntype = 'nude' and $pantyworntype = 'none':
 				$temp_curclothes = 'nude'
 			elseif PCloswimwear = 1:
@@ -195,7 +163,7 @@ if $ARGS[0] = 'lockerfemale':
 			$loc = 'pav_pool'
 			$loc_arg = 'lockerfemale'
 
-			!!Ignore Inhibition through willpower.
+			!!Ignore Inhibition through willpower
 			gt 'changingroom', 'view_swim_list', 1
 		end
 
@@ -205,7 +173,6 @@ if $ARGS[0] = 'lockerfemale':
 		*nl
 	end
 
-
 	if PCloswimwear = 1:
 		gs 'shoes', 'strip'
 		act 'Enter the pool area':
@@ -218,7 +185,6 @@ if $ARGS[0] = 'lockerfemale':
 		*nl
 	end
 
-
 	act 'Leave':
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			cla
@@ -233,53 +199,40 @@ if $ARGS[0] = 'lockerfemale':
 
 end
 
-
-
 if $ARGS[0] = 'showerfemale':
 	$loc_arg = 'showerfemale'
 	$location_type = 'private'
-
 	menu_off = 1
 	minut += 1
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/showergirl.jpg"></center>'
 	'The showers have seen better days. Thankfully, the water from the shower is very warm and feels great on your skin.'
 	
 	if $clothingworntype ! 'nude':
 		'You need to strip before you can shower.'
-
 	else
 		act 'Take a shower':
 			*clr & cla
 			minut += 15
 			dynamic $showerdin
 			gs 'stat'
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch2.jpg"></center>'
-
-			if     hour >=  8 and hour < 10:
+			if hour >= 8 and hour < 10:
 				'Almost nobody comes here this early in the morning, so you have the shower to yourself.'
-
 			elseif hour >= 10 and hour < 12:
 				'The pool is rather busy at this time, mostly with families with children and a few older people. An older woman is showering right now, but it''s otherwise quiet.'
-
 			elseif hour >= 12 and hour < 18:
 				'The pool and showers are crowded and you have to wait for someone else to finish first.'
-			
 			elseif hour >= 18 and hour < 20:
 				'Not many people visit the pool this late in the evening, with only a handful of adults coming for an after work swim. You have the shower to yourself.'
-
 			elseif hour >= 20 and hour < 21:
 				'It''s rather late and the pool will be closing soon. You think you''re among the last people in the building, so you''re alone and can enjoy the shower all to yourself.'
 			end
 
-
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
 			if rand(1,3) = 1 and hour >= 18 and hour < 21:
 				act 'Finish': gt 'pav_pool_event', 'shower_late'
-
 			else
 				act 'Finish': gt 'pav_pool', 'showerfemale'
 			end
@@ -289,25 +242,19 @@ if $ARGS[0] = 'showerfemale':
 	act 'Go back to the changing room': gt 'pav_pool', 'lockerfemale'
 end
 
-
-
 if $ARGS[0] = 'mirror':
 	!! ARGS[1] = 1 prevents the same event from triggering repeatedly.
 	$loc_arg = 'mirror'
 	$location_type = 'private'
-
 	if rand(1,10) = 1 and $clothingworntype = 'nude' and $pantyworntype = 'none' and ARGS[1] = 0:
 		gt 'pav_pool_event', 'naked_mirror'
 	end
-
 	minut += 1
 	gs 'stat'
 	$locM = 'pav_pool'
 	$locM_arg = 'mirror'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/mirrorsink.jpg"></center>'
 	'The area where the <a href="exec:minut += 1 & gt ''mirror'', ''start''">mirrors</a> are is just as murky as the rest of the changing room. It''s almost like the owners don''t care about the dilapidated appearance.'
-
 	if $clothingworntype = 'nude':
 		*nl
 		'You are completely naked.'
@@ -315,158 +262,117 @@ if $ARGS[0] = 'mirror':
 
 	act 'Go back to the changing room': gt 'pav_pool', 'lockerfemale'
 	if cumloc[11] = 1 or cumloc[12] or cumloc[16] = 1:
-			act 'Clean the cum from your face':
+		act 'Clean the cum from your face':
 			*clr & cla
 			menu_off = 1
 			minut += 5
-
 			pcs_makeup = 1
-
 			cumspclnt = 9
 			gs 'cum_cleanup'
 			cumspclnt = 13
 			gs 'cum_cleanup'
-
 			if pcs_sweat > 19 : pcs_sweat -= 5
-
 			gs 'stat' 
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/washface.jpg"></center>'
 			'You carefully wash the cum from your face at the sink.'
-
 			act 'Finish': gt 'pav_pool', 'mirror'
 		end
 	end
 end	
 
-
-
 if $ARGS[0]= 'cafeteria':
 	*clr & cla
-
 	$loc_arg = 'cafetaria'
 	$location_type = 'public_indoors'
 	minut += 1
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteria<<rand(1,2)>>.jpg"></center>'
-	'You are in the cafeteria. They don''t have a lot on the menu, just some snacks.'
+	'The cafeteria doesn''t have a lot on the menu and only offers some basic snacks.'
 	'Two girls are currently ordering from the cashier.'
 
 	act 'Order':
-		!!Removed rand()... No event, just sometimes it doesn''t work. 
-		!!if rand(1,100) < 93:
-	
 		*clr & cla
 		minut += 1
-
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteriaturn.jpg"></center>'
-		'It''s finally your turn. You sit on one of the stools while you order.'
+		'It''s finally your turn and you sit on one of the stools while you order.'
 
 		if money < 100:
 			'You don''t have enough money to buy a snack.'
 			act 'Return': gt 'pav_pool', 'cafeteria'
-
 		else
 			act 'Buy a snack (100 <b>₽</b>) (0:05)':
 				*clr & cla
 				gs 'stat'
-
 				minut += 5
 				money -= 100
 				pcs_health += 10
 				pcs_mood += 20
 				fat += 6
 				pcs_energy += 20
-
 				if pcs_hydra >= 100:
 					pcs_hydra += 10
-
 				else
 					pcs_hydra += 20
 				end
-
 				cumspclnt = 2
 				gs 'cum_cleanup'
 				pcs_breath = 0
 				gs 'food', 'aftermeal'
-
 				'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 				'You enjoy a small tasty, but somewhat fattening, snack.'
-
 				gs 'stat'
-
 				act 'Return': gt 'pav_pool', 'cafeteria'
 			end
 		end
 
-
 		act 'Drink some water (0:05)':
 			*clr & cla
 			frost = 1
 			if alko > 0: alko -= 1
-
 			minut += 5
 			pcs_health += 10
 			pcs_energy += 4
-
 			if pcs_hydra >= 100:
 				pcs_hydra += 25
-
 			else
 				pcs_hydra += 50
 			end
-
 			cumspclnt = 2
 			gs 'cum_cleanup'
 			pcs_breath = 0
 			gs 'beverage', 'afterdrink'
-
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barorderwater.jpg"></center>'
 			'You enjoy a glass of water.'
-
-			gs 'stat'
-
 			act 'Return': gt 'pav_pool', 'cafeteria'
 		end
-
-
 		act 'Leave': gt 'pav_pool', 'pool'
 	end
 end
 
-
-
 if $ARGS[0] = 'pool':
 	*clr & cla
-
 	$loc_arg = 'pool'
 	$location_type = 'public_indoors'
 	minut += 1
 	gs 'stat'
-
-
-	if     hour >=  8 and hour < 10:
+	
+	if hour >= 8 and hour < 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool1.jpg"></center>'
 		'The pool is almost empty this early in the morning. You can enjoy it almost all to yourself.'
-
 	elseif hour >= 10 and hour < 12:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool2.jpg"></center>'
 		'The pool is mostly used by families with children and older people at this time.'
-
 	elseif hour >= 12 and hour < 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool3.jpg"></center>'
 		'The pool is crowded with all kinds of people. This won''t be a relaxing swim...'
-
 	elseif hour >= 18 and hour < 20:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool4.jpg"></center>'
 		'Not many visit the pool this late in the evening, with only a few adults coming for an after work swim.'
-
 	elseif hour >= 20 and hour < 21:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/pool5.jpg"></center>'
 		'It''s rather late and the pool will be closing soon, so you''re mostly alone and can enjoy the pool all to yourself.'
 	end
 
-
 	'The pool is rather old, but still has a certain charm to it. The wall to wall windows allow for a nice atmosphere during the day and there is an upper balcony where people often watch from above.'
 	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">female locker room</a>.'
 	
@@ -496,7 +402,6 @@ if $ARGS[0] = 'pool':
 					'As you enter the water, your bikini bottom slides down your legs and leaves your ass exposed. Thankfully, nobody seems to notice and you quickly pull it up before anyone sees you.'
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 20 and temp_rand < 40:
 				act 'Continue':
 					*clr & cla
@@ -504,7 +409,6 @@ if $ARGS[0] = 'pool':
 					'As you enter the water, the knot of your bikini top loosens and your breasts pop out. Thankfully, nobody seems to notice and you quickly tie it back on before anyone sees you.'
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 40 and temp_rand < 50:
 				act 'Continue':
 					*clr & cla
@@ -514,7 +418,6 @@ if $ARGS[0] = 'pool':
 					pcs_mood -= 3
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
-
 			elseif temp_rand => 50 and temp_rand < 60:
 				act 'Continue':
 					*clr & cla
@@ -525,63 +428,46 @@ if $ARGS[0] = 'pool':
 					act 'Continue': gt 'pav_pool', 'poolwater'
 				end
 			end
-
 		elseif pcs_agil >= 45 and pcs_agil <= 70:
 			'You climb up to the top of the diving board and jump, but end up painfully bellyflopping into the water. You need to practice being more agile.'
-
 		else
 			'You climb up to the top of the diving board and make a very elegant jump, sliding into the water without causing a single ripple.'
 		end
-
-
 		act 'Continue': gt 'pav_pool', 'poolwater' 
 	end
 
 	act 'Sit with your feet in the water': gt 'pav_pool_events', 'feetwater' 
 end
 
-
-
 if $ARGS[0]= 'poolwater':
 	minut += 1
 	$loc_arg = 'poolwater'
 	$location_type = 'public_indoors'
-
 	pcs_hairbsh = 0
 	cumspclnt = 10
 	gs 'cum_cleanup'
-
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/inwater1.jpg"></center>'
 	'You are in the water. It feels very relaxing.'
-
-
-	if     hour >=  8 and hour < 10:
+	
+	if hour >= 8 and hour < 10:
 		'The pool is almost empty this early in the morning, so you have it almost all to yourself.'
-
 	elseif hour >= 10 and hour < 12:
 		'The pool mostly contains families with children and older people swimming.'
-
 	elseif hour >= 12 and hour < 18: 
 		'The pool is crowded with all kinds of people. It''s difficult to move around and exercising will be impossible.'
-
 	elseif hour >= 18 and hour < 20: 
 		'Not many visit the pool this late in the evening, with only a few adults in the water.'
-
 	elseif hour >= 20 and hour < 21: 
 		'It''s rather late and the pool will be closing soon. You are among the last people in the building, so you can enjoy the pool all to yourself.'
 	end
 
-
 	if hour >= 10 and hour < 18:
 		'It''s rather busy, but you can try to do a bit of swimming or dive for a bit of fun. You could also just try to relax at the edge of the pool or right here in the water.'
-
 	else
 		'The pool is almost empty, so you''re free to do a bit of relaxed swimming, exercise with a more powerful swim or dive for a bit of fun. You could also just relax at the edge of the pool or right here in the water.'
 	end
 
-
 	if hour >= 8 and hour < 21:
 		act 'Relaxed swim': gt 'pav_pool_events', 'relaxedswim' 
 
@@ -597,14 +483,10 @@ if $ARGS[0]= 'poolwater':
 	act 'Exit pool': gt 'pav_pool', 'exitpool'
 end
 
-
-
 if $ARGS[0]= 'exitpool':
 	minut += 1
 	$loc_arg = 'exitpool'
-
 	gs 'stat'
-
 	temp_rand = rand(1,15)
 	if temp_rand <= 4 and PCloOnePiece = 0 and hour >= 10 and hour < 18:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/exitloosebra.jpg"></center>'
@@ -626,7 +508,6 @@ if $ARGS[0]= 'exitpool':
 
 		act 'Continue':
 			*clr & cla
-
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/bratkid.jpg"></center>'
 			'You finally notice when your top falls off and your breasts are completely exposed. You cover them as best as you can and turn around to look for your top just in time to see a boy pick it up with a devious smile.'
 			'"If you want it back, come and get it!" He then jumps in the water and swims off.'
@@ -634,30 +515,25 @@ if $ARGS[0]= 'exitpool':
 			act 'Run to the locker room':
 				cla
 				'Blushing in embarrassment, you run to the locker room. Once there you strip naked. You can get rid of this bottom since it''s useless now.'
-
 				dynamic $clothingworntype + '[<<clothingwornnumber>>] = 0'
 				gs 'clothing', 'strip'
-
 				act 'Continue': gt 'pav_pool', 'lockerfemale'
 			end
+			
 			act 'Jump into the water after him':
 				pav_swimpool['boystole'] = 1
 				pav_swimpool['toplost'] = 1
 				*clr & cla
-
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/toplesspool.jpg"></center>'
 				'You jump bravely into the water after him. He swims off towards the other side of the pool and you attempt to follow, but the pool is full and many notice your lewdness. You suddenly realize, stop and cover yourself as a number of people stare at you.'
 				'You could try to reach the edge of the pool, but you would have to get very close to other people. You could also wait and hope that the pool empties a little without calling attention to yourself.'
-
 				act 'Wait': gt 'pav_pool_events', 'watertoplost'
 				act 'Try to reach the edge': gt 'pav_pool_events', 'tryreachedge'
 			end
 		end
-
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 		'You climb out of the pool.'
-
 		act 'Continue': gt 'pav_pool', 'pool'
 	end
 end

locations/pav_residential.qsrc

@@ -90,16 +90,16 @@ end
 !!	exit
 !!end
 
-if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
-if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events', 'start'
+if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters plastered on walls all over town. They say: "Vote Boris Barlovsky for mayor!" Wait a minute... isn''t that Albina''s father?'
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14: gt 'albina_election_events', 'start'
 
 if rand(1, 5) >= 4 and fame['pav_slut'] >= 150:
 	if fame['pav_slut'] < 200:
-		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite remember why. You sincerely hope they don''t realize your promiscuous adventures are the reason why. The occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
+		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite place you. You sincerely hope they don''t realize your promiscuous adventures are the reason why they recognize you, but the occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
 	elseif fame['pav_slut'] < 250:
-		'<br>People look at you with lewd grins on their faces, some of them even making vulgar gestures. Looks like they know what you''ve been up to.'
+		'<br>People look at you with lewd grins on their faces, some of them even making vulgar gestures. Your reputation appears to be the talk of the town.'
 	else
-		'<br>Everywhere you go, people recognize you as a whore. Some even come over and slap you on the ass, claiming they know you like it when they do, or claiming they want to sample your goods. An elderly woman sitting on a bench calls out to you, loudly calling you a slut and a whore. You hide your face and run away as fast as you can, before she can draw too much attention to you.'
+		'<br>Everywhere you go, people recognize you as a whore. Some even come over and slap you on the ass, claiming they know you like it or asking to ''sample your goods''. An elderly woman sitting on a bench calls out to you, loudly calling you a slut and a whore. You hide your face and run away as fast as you can before she can draw too much attention to you.'
 	end
 end
 
@@ -117,7 +117,7 @@ else
 	$schoolname = 'your old school.'
 end	
 
-'<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for the local teenagers to hang out after a long day at <<$schoolname>> or the <a href="exec: gt ''pav_pool'',''building''">local pool</a>. Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
+'<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for local teenagers to hang out. Also nearby is the drab grey building of Pavlovsk''s dilapidated public <a href="exec: gt ''pav_pool'',''building''"> swimming pool</a>. Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
 
 *nl
 !!made changes here, to remove direct links to the kids in the apartment complex, make sure this will work with the code left.
@@ -160,7 +160,7 @@ act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
 
-act 'Wait':gs 'obj_din', 'wait'
+act 'Wait': gs 'obj_din', 'wait'
 
 if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	act 'Go hunting near the community center (this can take a lot of time)':
@@ -227,12 +227,12 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg' and $start_type
 	exit
 end
 
-if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
+if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >= 22 or hour <= 2) and rand(1,100) >= 90 and AndRevstart ! daystart:
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-	'It is late and you are hurrying to get home when you are suddenly grabbed from behind. A large hand covers your mouth and you cannot scream. A powerful arm wraps around you and lifts you from your feet. You are dragged into an alleyway between two buildings and the arm around you loosens for just a minute.'
+	'It''s late and you''re hurrying to get home when you''re suddenly grabbed from behind. A large hand covers your mouth and you''re unable to scream as a powerful arm wraps around you and lifts you from your feet. You''re dragged into an alleyway between two buildings and the arm around you loosens for just a minute.'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
@@ -249,10 +249,8 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
-	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
-
+	'As you walk through Pavlovsk, Vadim Bely''s Mitsubishi Pajero stops near you.'
 	act 'Go to the jeep': gt 'belgang', 'payday' 	
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
@@ -260,10 +258,8 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang inside. Your heart skips a beat as you notice one of them pointing at you and they pull over.'
-		
 	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end