.gitignore

@@ -41,3 +41,5 @@ images.zip
 MakeQSP.bat
 /glife.iml
 /Qqsp-1.9.0-win64/
+glife.7z.tmp
+glife.7z

glife.qproj

@@ -91,6 +91,7 @@
 		<Location name="boyStat"/>
 		<Location name="pain"/>
 		<Location name="arousal"/>
+		<Location name="arousal_oneline"/>
 		<Location name="orgasm"/>
 		<Location name="dinSex"/>
 		<Location name="dinSex2"/>
@@ -777,6 +778,7 @@
 		<Location name="albinahome"/>
 		<Location name="albina_chat"/>
 		<Location name="albina_chat2"/>
+		<Location name="albina_sex_chat"/>
 		<Location name="albina_lazar_sex"/>
 		<Location name="albina_school_sex"/>
 		<Location name="albina_house_events"/>
@@ -902,6 +904,7 @@
 		<Location name="Club2"/>
 		<Location name="danceclass"/>
 		<Location name="city_library"/>
+		<Location name="city_hermitage"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
 		<Location name="casting"/>
@@ -926,6 +929,7 @@
 		<Location name="city_musicstore_stock"/>
 		<Location name="shop_materinstvo"/>
 		<Location name="shop_photography"/>
+		<Location name="photography_work"/>
 	</Folder>
 	<Folder name="City Residential">
 		<Location name="city_residential"/>

locations/Cum_Manage.qsrc

@@ -540,7 +540,7 @@ if $ARGS[0] = 'cumeater':
 
 		if cloc = 13:
 			gs 'cum_cleanup', 'cleanloc', cloc
-			'You carefully lick the sperm residue from both hands, enjoying the tart taste of semen.'
+			'You carefully lick the sperm residue from your hands, enjoying the tart taste.'
 		else
 			if cloc = 0:
 				$part = 'pussy'
@@ -577,9 +577,9 @@ if $ARGS[0] = 'cumeater':
 			end
 
 			if rand(0, 1) = 0:
-				'You collect a handful of sperm from your <<$part>> in your hand and lick it all up, enjoying the tart taste of semen.'
+				'You collect a handful of sperm from your <<$part>> in your hand and lick it up, enjoying the tart taste.'
 			else
-				'You collect the sperm from your <<$part>> with your fingers and lick them, enjoying the tart taste of semen.'
+				'You collect the sperm from your <<$part>> with your fingers and lick them, enjoying the tart taste.'
 			end
 
 			gs 'cum_cleanup', 'cleanloc', cloc
@@ -684,71 +684,87 @@ if $ARGS[0] = 'cum_stat_display':
 			$icon_txtloc = 'your pussy'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/creampie/cumpussy'+rand(1,14)+'.jpg''">pussy</a>'
 		elseif i = 1:
+			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your labia'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumpussy/cumpus'+rand(1,4)+'.jpg''">labia</a>'
 		elseif i = 2:
+			$txtloc_adj = 'across '
 			$txtloc = 'the front of your panties'
 			$icon_txtloc = $txtloc
 		elseif i = 3:
+			$txtloc_adj = 'across '
 			$icon_txtloc = 'your ass'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumanal/cumanal'+rand(1,11)+'.jpg''">ass</a>'
 		elseif i = 4:
+			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your butt'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumass/cumass'+rand(1,6)+'.jpg''">butt</a>'
 		elseif i = 5:
+			$txtloc_adj = 'painting '
 			$txtloc = 'the back of your panties'
 			$icon_txtloc = $txtloc
 		elseif i = 6:
+			$txtloc_adj = 'on '
 			$icon_txtloc = 'your clothes near your groin'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/'+rand(1,3)+'.jpg''">clothes near your groin</a>'
 		elseif i = 7:
+			$txtloc_adj = 'on '
 			$icon_txtloc = 'your clothes'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumclothes/cumclothes'+rand(1,21)+'.jpg''">clothes</a>'
 		elseif i = 8:
+			$txtloc_adj = 'down '
 			$txtloc = 'your back'
 			$icon_txtloc = $txtloc
 		elseif i = 9:
+			$txtloc_adj = 'on '
 			$txtloc = 'your legs'
 			$icon_txtloc = $txtloc
 		elseif i = 10:
+			$txtloc_adj = 'on '
 			$txtloc = 'your arms'
 			$icon_txtloc = $txtloc
 		elseif i = 11:
 			if pcs_haircol = 0:
 				$cum_face_image = 'brown/'
-				$cum_face_image += rand(1, 31)
+				$cum_face_image += rand(1,31)
 			elseif pcs_haircol = 1:
 				$cum_face_image = 'black/'
-				$cum_face_image += rand(1, 23)
+				$cum_face_image += rand(1,23)
 			elseif pcs_haircol = 2:
 				$cum_face_image = 'red/'
-				$cum_face_image += rand(1, 19)
+				$cum_face_image += rand(1,19)
 			elseif pcs_haircol = 3:
 				$cum_face_image = 'blonde/'
-				$cum_face_image += rand(1, 25)
+				$cum_face_image += rand(1,25)
 			elseif pcs_haircol > 3:
 				$cum_face_image = 'custom/'
-				$cum_face_image += rand(1, 20)
+				$cum_face_image += rand(1,20)
 			end
+			$txtloc_adj = 'across '
 			$icon_txtloc = 'your face'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumface/<<$cum_face_image>>.jpg''">face</a>'
 			killvar 'cum_face_image'
 		elseif i = 13:
+			$txtloc_adj = 'over '
 			$txtloc = 'your hands'
 			$icon_txtloc = $txtloc
 		elseif i = 14:
-			$icon_txtloc = 'your stomach'
-			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumbelly/cumbelly'+rand(1,12)+'.jpg''">stomach</a>'
+			$txtloc_adj = 'across '
+			$icon_txtloc = 'across your stomach'
+			$txtloc = 'across your <a href="exec:view''images/pc/body/cum/cumbelly/cumbelly'+rand(1,12)+'.jpg''">stomach</a>'
 		elseif i = 15:
-			$icon_txtloc = 'your breasts'
+			$txtloc_adj = 'on '
+			$icon_txtloc = 'on your breasts'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumtits/cumtits'+rand(1,19)+'.jpg''">breasts</a>'
 		elseif i = 16:
+			$txtloc_adj = 'in '
 			$icon_txtloc = 'your hair'
 			$txtloc = 'your hair</a>'
 		elseif i = 17:
 			$txtloc = 'in your vagina in a slipped condom'
 			$icon_txtloc = $txtloc
 		else
+			$txtloc_adj = 'on '
 			$icon_txtloc = 'the gusset of your panties'
 			$txtloc = 'the gusset of your panties</a>'
 		end
@@ -780,9 +796,9 @@ if $ARGS[0] = 'cum_stat_display':
 					if (vibratorIN = 1 and i = 0) or (analplugin = 1 and i = 3):
 						$txtproxy = 'being plugged in '
 					elseif i = 0 and cumvolume['<<i>>:<<j>>'] < pcs_vag*5:
-						$txtproxy = 'staying inside of '
+						$txtproxy = 'staying inside '
 					elseif i = 3 and pcs_ass <= 25:
-						$txtproxy = 'staying inside of '
+						$txtproxy = 'staying inside '
 					else
 						if cumvolume['<<i>>:<<j>>'] > 250:
 							$txtproxy = 'gushing out of '
@@ -791,7 +807,7 @@ if $ARGS[0] = 'cum_stat_display':
 						elseif cumvolume['<<i>>:<<j>>'] >= 40:
 							$txtproxy = 'seeping out of '
 						else
-							$txtproxy = 'staying inside of '
+							$txtproxy = 'staying inside '
 						end
 					end
 				elseif j >= 5:
@@ -814,7 +830,7 @@ if $ARGS[0] = 'cum_stat_display':
 						$txtproxy = 'covering '
 					else
 						!! residue amount, no leakage
-						$txtproxy = 'spattering '
+						$txtproxy = 'spattered '
 					end
 					if j = 1:
 						$txtproxy += 'wetly '
@@ -823,6 +839,9 @@ if $ARGS[0] = 'cum_stat_display':
 					else
 						$txtproxy += 'powderly '
 					end
+					if cumvolume['<<i>>:<<j>>'] < 40:
+						$txtproxy += $txtloc_adj
+					end
 				end
 
 				$txtperson = ''
@@ -941,30 +960,30 @@ if $ARGS[0] = 'cum_stat_display':
 		if cumloc[6] = 1:
 			stat_visible_cum = 1
 			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your clothes near your groin'
+			$stat_visible_cum_temp += 'on your clothes near your groin'
 		end
 		if cumloc[7] = 1:
 			stat_visible_cum = 1
 			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your clothes'
+			$stat_visible_cum_temp += 'on your clothes'
 		end
 		if cumloc[11] = 1:
 			stat_visible_cum = 1
 			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your face'
+			$stat_visible_cum_temp += 'on your face'
 		end
 		if cumloc[13] = 1:
 			stat_visible_cum = 1
 			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your hands'
+			$stat_visible_cum_temp += 'on your hands'
 		end
 		if cumloc[16] = 1:
 			stat_visible_cum = 1
 			if $stat_visible_cum_temp ! '': $stat_visible_cum_temp += ', '
-			$stat_visible_cum_temp += 'your hair'
+			$stat_visible_cum_temp += 'in your hair'
 		end
 
-		$stat_visible_cum_msg = 'People can see the cum on '+ $stat_visible_cum_temp + '.'
+		$stat_visible_cum_msg = 'People can see the cum '+ $stat_visible_cum_temp + '.'
 	end
 	cum_loc['vagina'] = cumloc[0]
 	cum_loc['labia'] = cumloc[1]

locations/Katja_nightclub.qsrc

@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'dance_guy3':
 				end
 			else
 				'After some time, he tells you that his place isn''t far from here and suggests that you continue the party at his place, making it very clear that he''s expecting his bedroom to be the main location of the party.'
-				if katjaQW['QWstage'] < 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] < rand (50,100):
+				if katjaQW['QWstage'] <= 5 or katjaQW['boy_block'] = 1 or katjaQW['sex_clossedness'] > 0 or func('katja_procdural', 'willing_to_be_naughty') + katjQW['horny'] < rand (50,100):
 					'"No. We prefer to stay here and dance," Katja replies quickly in a firm voice, which clearly surprises the guy.'
 					if katjaQW['QWstage'] >= 5 and katjaQW['boy_block'] = 0 and katjaQW['sex_clossedness'] = 0:
 						act 'Try to convince Katja to go with him':

locations/Nudelake.qsrc

@@ -90,7 +90,9 @@ gs 'stat'
 if hour >= 6 and hour <= 20 and temper >= 15:
 	if $clothingworntype = 'nude':
 		'Here you can <a href="exec:gt ''Nudelake'', ''zagarat''">sunbathe</a> and <a href="exec:gt ''Nudelake'', ''swim''">swim</a>'
-		act 'Go swimming': gt 'Nudelake', 'swim'
+		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+			act 'Go swimming': gt 'Nudelake', 'swim'
+		end
 		act 'Sunbathe': gt 'Nudelake', 'zagarat'
 		'You can play <a href="exec:gt ''Nudelake'', ''voleybol''">beach volleyball</a>.'
 	end
@@ -183,12 +185,11 @@ if $ARGS[0] = 'swim':
 	pcs_makeup = 1
 	cumspclnt = 4
 	gs 'cum_cleanup'
-	minut += 60
+	gs 'exercise', 'tier1', 60, 'stren'
 	if $clothingworntype = 'nude':
 		gs 'exercise', 'tier1', 1, 'stren'
 		inhib_exp += rand(1,3)
 	else
-		gs 'exercise', 'tier1', 1, 'stren'
 		if pcs_inhib < 50:inhib_exp += rand(1,3)
 	end
 	pcs_sweat = 10 + rand(0,4)

locations/WorkHosp.qsrc

@@ -19,11 +19,11 @@ if $ARGS[0] = 'start':
 		minut += 60
 		gs 'exp_gain', 'medcn', rand (0,2) 
 
-		if jobhosprand = 0:gt 'WorkHosp', '2'
+		if jobhosprand = 0: gt 'WorkHosp', '2'
 
 		'You work as part of the operating team, helping the doctors with whatever tasks they request of you.'
 
-		act 'Move away':gt 'WorkHosp', 'start'
+		act 'Move away': gt 'WorkHosp', 'start'
 	end
 
 	act 'Help the doctors in the emergency room (1:00)':
@@ -31,11 +31,11 @@ if $ARGS[0] = 'start':
 		minut += 60
 		gs 'exp_gain', 'medcn', rand (0,2)
 
-		if jobhosprand = 0:gt 'WorkHosp', '3'
+		if jobhosprand = 0: gt 'WorkHosp', '3'
 
 		'You spend a frenzied hour helping patients that come into the emergency room.'
 
-		act 'Move away':gt 'WorkHosp', 'start'
+		act 'Move away': gt 'WorkHosp', 'start'
 	end
 
 	act 'Relax in the nurse station':
@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 
 		if pcs_inhib > 20:
 			act 'Masturbate (0:15)':
-				mastrrand = rand(0, 2)
+				mastrrand = rand(0,2)
 
 				if mastrrand = 0:
 					gt 'WorkHosp', '1'
@@ -54,55 +54,52 @@ if $ARGS[0] = 'start':
 					*clr & cla
 					picrand = 11
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/mastr11.jpg"></center>'
-					'You begin to secretly masturbate whenever nobody is watching.'
+					'You secretly masturbate whenever nobody is watching.'
 					$orgasm_or = 'yes'
-					$orgasm_txt = 'Gradually a pleasant warmth and sensation radiates from your needy sex, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
+					$orgasm_txt = 'Gradually, a pleasant warmth and sensation radiates from your needy pussy, culminating in a powerful orgasm that sends waves of pleasure through your entire body.'
 					gs 'arousal', 'clit_finger', 15, 'masturbate'
 					gs 'stat'
 				end
 
-				act 'Leave':gt 'WorkHosp', 'start'
+				act 'Leave': gt 'WorkHosp', 'start'
 			end
 		end
 
-		act 'Move away':gt 'WorkHosp', 'start'
+		act 'Move away': gt 'WorkHosp', 'start'
 	end
 
-	act 'Eat in the cafeteria (0:30)':gs 'food', 'm_meal'
+	act 'Eat in the cafeteria (0:30)': gs 'food', 'm_meal'
 
 	act 'Chat with Kat':
 		cla
 		minut += 30
 		kat += 1
-
-		if npc_rel['A219'] > 60 and military = 0:gt 'WorkHosp', 'milit'
-
+		if npc_rel['A219'] > 60 and military = 0: gt 'WorkHosp', 'milit'
 		'You spend some time chatting with Kat.'
-
-
 		if npc_rel['A219'] > 50:
-			act 'Suggest going to an empty room together':gt 'WorkHosp', '0'
+			act 'Suggest going to an empty room together': gt 'WorkHosp', '0'
 		end
 
-		act 'Move away':gt 'WorkHosp', 'start'
+		act 'Move away': gt 'WorkHosp', 'start'
 	end
 
 	if hour >= 16:
-		cls
+		*clr & cla
 		'<center><b><font color="maroon">Clinic</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/hospital.jpg"></center>'
 		'Your shift has ended.'
 
-		act 'Go home':gt 'city_residential'
+		act 'Go home': gt 'city_residential'
 	end
 end
 
 if $ARGS[0] = 'milit':
 	cla
 	military = 1
-	'"Listen, I am scheduled to work this weekend, but I have plans. Here''s the deal: war games are often held not far from the city and, well, according to the rules, they need doctors on site before they can begin. Don''t worry, you will have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, on Saturday you can catch a bus at the clinic between 6 and 9. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?" asks Kat.'
+	'Kat turns to you. "Listen, I''m scheduled to work this weekend, but I have plans. Here''s the deal: war games are often held not far from the city and, well, according to the rules, they need doctors on site before they can begin.' 
+	'She notices your reaction. "Don''t worry, you''ll have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, you can catch a bus at the clinic on Saturday between 06:00 and 09:00. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?"'
 
-	act 'Move away':gt 'WorkHosp', 'start'
+	act 'Move away': gt 'WorkHosp', 'start'
 end
 
 if $ARGS[0] = '0':
@@ -116,10 +113,11 @@ if $ARGS[0] = '0':
 		xgt 'lezbsex', 'var'
 	elseif katprorand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex7.jpg"></center>'
-		'You and Kat have just begun to fondle each other when a patient enters the room. You back away from her, trying to pretend that nothing was happening. In contrast, Kat does not hesitate and lies down on the couch with her legs spread wide, proudly showing off her wet pussy. She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing, while looking hungrily at the guy and inviting him to join in the fun.'
+		'You and Kat have just begun to fondle each other when a patient enters the room. You back away from her, trying to pretend that nothing was happening. In contrast, Kat doesn''t hesitate and lies down on the couch with her legs spread wide, proudly showing off her wet pussy.' 
+		'She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing while looking hungrily at the guy and inviting him to join in the fun.'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		gs 'stat'
-		act 'Leave':gt 'WorkHosp', 'start'
+		act 'Leave': gt 'WorkHosp', 'start'
 
 		act 'Sounds like fun':
 			girl += 1
@@ -137,7 +135,7 @@ if $ARGS[0] = '0':
 		end
 	elseif katprorand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex8.jpg"></center>'
-		'While Kat and you are in full swing, two doctors enter the room. You are both so engrossed with each other that you don''t even notice them until they started to caress you. You both spread your legs wider, inviting them to join the fun.'
+		'While you and Kat are in full swing, two doctors enter the room. You are both so engrossed with each other that you don''t even notice them until they start caressing you. You both spread your legs wider, inviting them to join the fun.'
 
 		act 'Entertain them':
 			gang += 1
@@ -163,11 +161,11 @@ end
 
 if $ARGS[0] = '1':
 	cla & *clr
-	mastrrand = rand(0, 1)
+	mastrrand = rand(0,1)
 
 	if mastrrand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex9.jpg"></center>'
-		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room, but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
+		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room, but you''re so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
 		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'stat'
 		
@@ -186,17 +184,16 @@ if $ARGS[0] = '1':
 			guy += 1
 			picrand = 12
 			gs 'WorkHosp', 'randdoc'
-			if docfuck[randdoc] = 1:guy += 1
-				
+			if docfuck[randdoc] = 1: guy += 1
 			gt 'sex', 'minet'
 		end
 	else
 		picrand = rand(12, 13)
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex10.jpg"></center>'
-		'As you lose yourself in pleasure, two doctors come into the room. You are so distracted that you only notice them when they start to openly masturbate in front of you.'
+		'As you lose yourself in pleasure, two doctors come into the room. You''re so distracted that you only notice them when they start to openly masturbate in front of you.'
 		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'stat'
-					
+	
 		act 'Leave':
 			gs 'arousal', 'end'
 			gt 'WorkHosp', 'start'
@@ -232,7 +229,7 @@ if $ARGS[0] = '2':
 	*clr & cla
 	picrand = rand(13, 15)
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex11.jpg"></center>'
-	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him, as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
+	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
 	
 	act 'Oust him':
 		gs 'exp_gain', 'medcn', rand (0,1) 
@@ -254,9 +251,9 @@ end
 if $ARGS[0] = '3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex12.jpg"></center>'
-	'A pretty patient comes into the room, and the doctor tries to examine her. Then she touches his trousers near his poorly hidden erection. The doctor glances at you with a question in his eyes.'
+	'A pretty patient comes into the room and the doctor tries to examine her. She touches him near his poorly hidden erection and the doctor glances at you with a question in his eyes.'
 	
-	act 'Ask if she actually needs treatment':gs 'exp_gain', 'medcn', rand (0,1) & gt 'WorkHosp', 'start'
+	act 'Ask if she actually needs treatment': gs 'exp_gain', 'medcn', rand (0,1) & gt 'WorkHosp', 'start'
     
 	gs 'willpower', 'sex', 'self'
 	if will_cost <= pcs_willpwr: 

locations/_attributes_gm_panties.qsrc

@@ -131,8 +131,8 @@ elseif ARGS[1] = 18:
 elseif ARGS[1] = 19:
 	PanType = 1
 	PanFun = 1
-	PanMaterial = 1
-	PanQuality = 5
+	PanMaterial = 6
+	PanQuality = 2
 	PanThinness = 3
 	underwear['pair'] = 19
 

locations/albina_chat2.qsrc

@@ -21,6 +21,7 @@ if $ARGS[0] = 'first_model_talk1':
 				'"Why? What kind of modelling are you doing?" she asks suspiciously.'
 				gs 'albina_chat2','first_model_talk_shy1'
 				gs 'albina_chat2','first_model_talk2'
+				gs 'albina_chat2','first_model_talk_proud2'
 			else
 				act 'I didn''t want people to know':
 					cla & *nl
@@ -34,6 +35,64 @@ if $ARGS[0] = 'first_model_talk1':
 	end
 end
 
+if $ARGS[0] = 'first_model_talk_proud2':
+	act 'Tell her (proud)':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		if $model['type'] = 'catalog':
+			'"Catalogue modelling!" you say with bubbly excitement. "The kind that you see on websites to show what''s for sale or in magazines with a company''s stock. It''s not much right now, but it''s a foot in the door!"'
+			'"Why didn''t you tell me sooner?!" Albina squeals gleefully alongside you.'
+			'"It''s an 18+ agency," you explain. "And since I''m underage, I have to keep it on the down low. I needed a fake passport just to get registered there. They do all kinds of other stuff there. Fashion, lingerie, nudes, you name it."'
+			gs 'albina_chat2','first_model_talk3'
+		elseif $model['type'] = 'fashion':
+			'"Fashion modelling!" you whisper excitedly. "Fancy dresses, designer clothing, all the stuff you see in magazines but never actually see people wearing in real life. <i>I</i> get to wear that!"'
+			'"That''s so cool!" Albina shouts, punching you in the arm again. "Why are you hiding it?"'
+			'"It''s an 18+ agency," you explain. "I have a fake passport just to work there. They do all kinds of other stuff there. Fashion, lingerie, nudes, you name it."'
+			gs 'albina_chat2','first_model_talk3'
+		elseif $model['type'] = 'lingerie':
+			'"I''m a freaking lingerie model!" you whisper excitedly. "High end bras and panties, brand names like Victoria''s Secret and Mon Cheri!"'
+			'"That''s so cool!" Albina shouts, punching you in the arm again. "You''re a goddamn supermodel! Why are you hiding it?"'
+			'"It''s an 18+ agency," you explain. "I have a fake passport just to work there. They do other stuff there too. Erotic nudes and all that."'
+			gs 'albina_chat2','first_model_talk3'
+		elseif $model['type'] = 'glamour':
+			if modelfoto['topless'] > 0:
+				'"I do glamour modelling!" you whisper excitedly. "Sexy shoots with tight or thin clothing, a lot of cleavage and a lot of leg. I''ve even gone topless!"'
+				gs 'albina_chat2','first_model_talk4'
+			else
+				'"I do glamour modelling!" you whisper excitedly. "Sexy shoots with tight or thin clothing, a lot of cleavage and a lot of leg. Sometimes my ass too, but never my tits or pussy. They do that kind of modelling there too."'
+				gs 'albina_chat2','first_model_talk3'
+			end
+		elseif $model['type'] = 'fitness':
+			if modelfoto['topless'] > 0:
+				'"I model a lot of sports clothing," you say proudly. "But I do other stuff too. I''ve even shown off my tits!"'
+				gs 'albina_chat2','first_model_talk4'
+			else
+				'"I model a lot of sports clothing," you say proudly. "Sports bras and tight yoga pants and stuff like that. Pretty cool, huh? They do all kinds of modelling there. Even nude modelling."'
+				gs 'albina_chat2','first_model_talk3'
+			end
+		elseif $model['type'] = 'artistic nude':
+			'"Nude modelling!" you squeal in a hushed but excited tone.'
+			gs 'albina_chat2','first_model_talk4'
+		elseif $model['type'] = 'erotic':
+			'"Erotic nude modelling!" you squeal in a hushed but excited tone.'
+			gs 'albina_chat2','first_model_talk4'
+		else
+			if modelfoto['nude'] > 0:
+				'"All kinds of modelling," you say excitedly. "I''ve even done nudes!"'
+				gs 'albina_chat2','first_model_talk4'
+			elseif modelfoto['topless'] > 0:
+				'"All kinds of modelling," you say excitedly. "I''ve even gone topless!"'
+				gs 'albina_chat2','first_model_talk4'
+			else
+				'"All kinds of modelling," you say excitedly. "High end fashion. Lacy lingerie. Tight clothing, thin material. You name it."'
+				'"That''s so cool!" Albina exclaims, punching you in the arm again. "You''re a goddamn supermodel! "Why are you hiding it?"'
+				'"It''s an 18+ agency," you explain. "I have a fake passport just to work there. They do other stuff there too. Erotic nudes and all that."'
+				gs 'albina_chat2','first_model_talk3'
+			end
+		end
+	end
+end
+
 if $ARGS[0] = 'first_model_talk2':
 	act 'Tell her (nonchalant)':
 		cla & *clr
@@ -155,16 +214,15 @@ if $ARGS[0] = 'first_model_talk4':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'Albina searches and finds your profile.'
 			'"You didn''t even change your name?" she snickers.'
-			
 			act'It seemed wrong':
 				cla & *nl
-				'"It felt weird going by something that wasn''t my name," you shrug as she clicks a link you know leads straight to your nude debut.'
+				'"It felt weird going by something that wasn''t my name," you shrug as she clicks a link you know leads straight to your nude debut. "My name is who I am after all."'
 				act'Continue':gs 'albina_chat2','first_model_talk_nude1'
 			end
 			
 			act'It was a hassle':
 				cla & *nl
-				'"I just seemed like a hassle, needing to remember to go by different names and all that," you shrug as she clicks a link you know leads straight to your nude debut.'
+				'"It felt like a hassle, needing to remember to go by different names and all that," you shrug as she clicks a link you know leads straight to your nude debut.'
 				act'Continue':gs 'albina_chat2','first_model_talk_nude1'
 			end
 			
@@ -187,8 +245,7 @@ if $ARGS[0] = 'first_model_talk4':
 			'Albina stops, turning to look at you with a frown. You give her a stare and she stares back.'
 			*nl
 			'"Damn!" she swears after a moment. "Tell me what to search!"'
-			'"Nope! You''re never finding those pics," you reply smugly, enjoying a rare moment of superiority over your friend.'
-			gs 'albina_chat','small_talk'
+			gs 'albina_chat','first_model_talk_tell'
 		end
 			
 		act'Let her search':
@@ -198,22 +255,27 @@ if $ARGS[0] = 'first_model_talk4':
 			'"Why can''t I find it?!" she grumbles, cursing.'
 			'"I don''t use my <i>actual</i> name when modelling," you say. "Do you think I''m crazy?"'
 			'"Come ooooonnn!" she moans. "Tell me what to search!"'
-			act'Nope':
-				cla & *nl
-				'"Nope! You''re never finding those pics," you reply smugly, enjoying a rare moment of superiority over your friend.'
-				gs 'albina_chat','small_talk'
-			end
-			act'Tell her':
-				cla & *nl
-				'You spend a few moments considering tantalizing her with the knowledge but eventually you relent.'
-				'"Okay," you snicker. "I go by <<$model[''firstname'']>> <<$model[''lastname'']>>."'
-				'Her eyes light up and immediately starts clacking away on the keyboard. Moments later, she''s clicking a link that you know leads to your nude debut.'
-				act'Look at the photos':gs 'albina_chat2','first_model_talk_nude1'
-			end
+			gs 'albina_chat','first_model_talk_tell'
 		end
 	end
 end
 
+if $ARGS[0] = 'first_model_talk_tell':
+	act'Nope':
+		cla & *nl
+		'"Nope! You''re never finding those pics," you reply smugly, enjoying a rare moment of superiority over your friend.'
+		gs 'albina_chat','small_talk'
+	end
+	
+	act'Tell her':
+		cla & *nl
+		'You spend a few moments considering tantalizing her with the knowledge but eventually you relent.'
+		'"Okay," you snicker. "I go by <<$model[''firstname'']>> <<$model[''lastname'']>>."'
+		'Her eyes light up and immediately starts clacking away on the keyboard. Moments later, she''s clicking a link that you know leads to your nude debut.'
+		act'Look at the photos':gs 'albina_chat2','first_model_talk_nude1'
+	end
+end
+
 if $ARGS[0] = 'first_model_talk_nude1':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/1.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/2.jpg"> <img <<$set_imgh>> src="images/locations/city/citycenter/photo/shoots/nude/debut/3.jpg"></center>'
@@ -232,8 +294,8 @@ if $ARGS[0] = 'first_model_talk_nude1':
 		cla & *nl
 		'"I know, right?" you grin. A warm blush spreads through your cheeks despite your pride in your work, unable to help but be a little embarrassed as Albina expands the images to full screen and takes advantage of the high definition to zoom <i>very</i> far in.'
 		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
-			'"I can''t believe you were hiding them from me!" she exclaims. "By the way, I thought you didn''t shave?"'
-			'Albina zooms way in on your pussy, getting a close up of your cleanshaven lips.'
+			'"I can''t believe you were hiding them from me!" she exclaims. " By the way, what''s the deal? I thought you didn''t shave?"'
+			'Albina zooms way in on your crotch, getting a close up of your cleanshaven pussy.'
 		else
 			'"I can''t believe you were hiding them from me!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me!"'
 		end
@@ -244,8 +306,8 @@ if $ARGS[0] = 'first_model_talk_nude1':
 		cla & *nl
 		'"Not bad, are they?" you smirk, amused by the look of excitement on Albina''s face as she rapidly clicks through photos, often expanding them to full screen to take advantage of the high definition and zoom <i>very</i> far in.'
 		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
-			'"I can''t believe you were hiding them from me!" she exclaims. "By the way, I thought you didn''t shave?"'
-			'Albina zooms way in on your pussy, getting a close up of your cleanshaven lips.'
+			'"I can''t believe you were hiding them from me!" she exclaims. " By the way, what''s the deal? I thought you didn''t shave?"'
+			'Albina zooms way in on your crotch, getting a close up of your cleanshaven pussy.'
 		else
 			'"I can''t believe you were hiding them from me!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me!"'
 		end
@@ -256,13 +318,37 @@ if $ARGS[0] = 'first_model_talk_nude1':
 		cla & *nl
 		'"You''re just saying that," you remark skeptically even as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features."'
 		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
-			'"Fuck no!" she exclaims. "Why would I lie? Just looking at these makes me want to eat you out right now! I can''t believe you were hiding them from me! By the way, I thought you didn''t shave?"'
+			'"Fuck no!" she exclaims. "Why would I lie? Just looking at these makes me want to eat you out right now! I can''t believe you were hiding them from me!  By the way, what''s the deal? I thought you didn''t shave?"'
 			'Albina takes advantage of the high resolution and zooms way in on your pussy, getting a close up of your cleanshaven lips.'
 		else
 			'"Fuck no!" she exclaims. "Why would I lie? Just looking at these makes me want to eat you out right now!"'
 		end
 		gs 'albina_chat2','first_model_talk_nude2'
 	end
+	
+	act'Professional pride':
+		cla & *nl
+		'"It turned out well didn''t it?" you smile as she furiously clicks through them, expanding them to full screen and going out of her way to zoom in on your tits and pussy. "It was a big step for me."'
+		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
+			'"I can''t believe you were hiding this from me!" she exclaims. " By the way, what''s the deal? I thought you didn''t shave?"'
+			'Albina zooms way in on your crotch, getting a close up of your cleanshaven pussy.'
+		else
+			'"I can''t believe you were hiding them from me!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me!"'
+		end
+		gs 'albina_chat2','first_model_talk_nude2'
+	end
+	
+	act'Self centered pride':
+		cla & *nl
+		'"Fuck yeah I do," you grin, even ogling yourself a little bit as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features."'
+		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
+			'"Modest aren''t we?" she snickers back. "I can''t believe you were hiding this from me! By the way, what''s the deal? I thought you didn''t shave?"'
+			'Albina zooms way in on your crotch, getting a close up of your cleanshaven pussy.'
+		else
+			'"Modest aren''t we?" she snickers back. "I can''t believe you were hiding this from me! These photos are incredible!"'
+		end
+		gs 'albina_chat2','first_model_talk_nude2'
+	end
 end
 
 if $ARGS[0] = 'first_model_talk_nude2':
@@ -403,7 +489,7 @@ if $ARGS[0] = 'first_model_talk_nude_pubes_shaved':
 			'"They made me do it," you sigh. "This is my nude debut. The studio''s policy is that models have to go cleanshaven for their first nude set. I didn''t want to do it, but they refused to do the shoot unless I did. I really liked my bush! I was so annoyed how long it took to grow back!"'
 			'Albina''s grin fades and takes on a more somber expression, scrolling through the pictures of you with new eyes.'
 			if AlbinaQW['shave_story'] = 1:
-				'"I told you about why I started shaving, didn''t I?" she asks referring to that story she told you while you were both drunk after the pool. "What you said reminds me of that."'
+				'"I told you about why I started shaving, didn''t I?" she asks in a flat tone, referring to what she told you while you were both drunk after the pool. "What you said reminds me of that."'
 				'Albina shuts the lid on her laptop and pushes it away.'
 				'"I''m sorry <<$pcs_nickname>>," she says tenderly. "Maybe we should talk about something else?"'
 			else
@@ -418,7 +504,7 @@ if $ARGS[0] = 'first_model_talk_nude_pubes_shaved':
 			'"They made me do it," you sigh. "This is my nude debut. The studio''s policy is that models have to go cleanshaven for their first nude set. I didn''t want to do it, but they refused to do the shoot unless I did."'
 			'Albina''s grin fades and takes on a more somber expression, scrolling through the pictures of you with new eyes.'
 			if AlbinaQW['shave_story'] = 1:
-				'"I told you about why I started shaving, didn''t I?" she asks referring to that story she told you while you were both drunk after the pool. "What you said reminds me of that."'
+				'"I told you about why I started shaving, didn''t I?" she asks in a flat tone, referring to what she told you while you were both drunk after the pool. "What you said reminds me of that."'
 				'Albina shuts the lid on her laptop and pushes it away.'
 				'"I''m sorry <<$pcs_nickname>>," she says tenderly. "Maybe we should talk about something else?"'
 			else
@@ -724,7 +810,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy1':
 		cla & *nl
 		'"You really think so?" you ask. You blush furiously as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features," but deep inside your chest you also feel a certain warmth. Something that feels good to be recognized.'
 		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
-			'"Fuck yes!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me! By the way, I thought you didn''t shave?"'
+			'"Fuck yes!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me!  By the way, what''s the deal? I thought you didn''t shave?"'
 			'Albina takes advantage of the high resolution and zooms way in on your pussy, getting a close up of your cleanshaven lips.'
 		else
 			'"Fuck yes!" she exclaims. "These photos are incredible! I can''t believe you were hiding them from me!"'
@@ -736,7 +822,7 @@ if $ARGS[0] = 'first_model_talk_nude_shy1':
 		cla & *nl
 		'"You''re just saying that," you remark skeptically even as she furiously clicks through them, expanding them to full screen and even zooming in at times, especially on your "womanly features."'
 		if pcs_pubes > 10 and AlbinaQW['model_shave'] = 0:
-			'"Fuck no!" she exclaims. "Why would I lie? Just looking at these makes me want to eat you out right now! I can''t believe you were hiding them from me! By the way, I thought you didn''t shave?"'
+			'"Fuck no!" she exclaims. "Why would I lie? Just looking at these makes me want to eat you out right now! I can''t believe you were hiding them from me!  By the way, what''s the deal? I thought you didn''t shave?"'
 			'Albina takes advantage of the high resolution and zooms way in on your pussy, getting a close up of your cleanshaven lips.'
 		else
 			'"Fuck no!" she exclaims. "Why would I lie? These photos are incredible! I can''t believe you were hiding them from me!"'
@@ -800,7 +886,28 @@ end
 if $ARGS[0] = 'recurrent_model_talk1':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'"So, what''s it like working as a model?" Albina asks looking curious.'
+	'"What''s it like working as a model?" Albina asks looking curious.'
+	act'It''s whatever':
+		cla & *nl
+		'"It''s whatever," you shrug. "Same as any other job I guess. Show up, do the work, get paid."'
+		'"That''s all you have to say about being a fucking super model?" she grins back, punching you in the arm. "You bitch."'
+		if ''
+	end
+	
+	
+end
+
+if $ARGS[0] = 'recurrent_porn_talk1':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"So..." Albina starts hesitantly, nervously drumming her fingers. "How''s... the uhh... <i>porn stuff</i> going...?"'
+	act'We don''t have to talk about this':
+		albinaQW['no_porn_talk'] = 1
+		cla & *nl
+		'"Albina," you say gently. "If you''re uncomfortable with what I do for money, we don''t have to talk about it."'
+		'She nods back, looking grateful and changes the subject.'
+		gs 'albina_chat','small_talk'
+	end
 end
 
 --- albina_chat2 ---------------------------------

locations/albina_sex_chat.qsrc

@@ -0,0 +1,1047 @@
+# albina_sex_chat
+
+if $ARGS[0] = 'sex_talk_start':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	if stat['think_virgin'] = 1:
+		'Knowing that you don''t have much experience in the subject, she offers to change the topic.'
+		gs 'albina_sex_chat', 'sex_talk'
+	else
+		'You steer the conversation towards sex, a topic Albina is more than comfortable with and readily engages with you about it.'
+	!!'You steer the conversation towards sex, a topic Albina is a girl who is comfortable about her sexuality and so you end up talking about sex.'
+		*nl
+		gs 'albina_sex_chat', 'sex_talk2'
+	end
+end
+
+if $ARGS[0] = 'sex_talk':
+	act 'Stop talking': gt 'albinahome', 'bedroom'
+	act 'Change the subject': gt 'albina_chat', 'chat'
+	act 'Keep talking about sex': gs 'albina_sex_chat', 'sex_talk2'
+	act 'Ask her about anal': gt 'albina_sex_chat', 'anal'
+end
+
+if $ARGS[0] = 'sex_talk2':
+	minut += 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	gs 'albina_sex_chat', 'sex_talk_topics'
+	
+	gs 'albina_sex_chat', 'sex_talk_albina_lead'
+end
+
+if $ARGS[0] = 'sex_talk_topics':
+	act'Lead the conversation':
+		cla
+		gs 'albina_sex_chat', 'blowjob_talk1'
+	end
+end
+
+if $ARGS[0] = 'blowjob_talk1':
+	act'Talk about blowjobs':
+		cla
+		act'"Do you like blowjobs?"':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Do you like giving blowjobs?" you ask Albina. She twists her lips thoughtfully almost like she can''t make up her mind.'
+			'"I don''t really mind giving head, but it''s not my favorite," she says eventually. "It''s just foreplay to get the guy hard or a way to get them to finish. Although... when a guy grabs my hair, takes charge, and shoves it down my throat... <i>fuck me</i>... There''s something so hot about that. It''s actually made me cum once or twice before."'
+			act'"I don''t like blowjobs"':
+				cla & *nl
+				'"Really? You''ve gotten off on a blowjob before?" You wrinkle your nose. "I hate blowjobs. The taste is awful, they make my jaw ache, and they''re just gross all around."'
+				'"I can understand that," Albina nods. "They''re not for everybody. I guess I''ve just seen so much cock I''m used to the taste. And just to be clear, it''s only in that specific situation that I like blowjobs."'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+			
+			act'"That''s hot"':
+				cla & *nl
+				'"That''s fucking hot," you grin at her, causing her to grin back.'
+				'"Well? What about you? Do you like giving head?"'
+				gs 'albina_sex_chat', 'blowjob_talk2'
+			end
+			
+			act'Tease her':
+				cla & *nl
+				'"You cum from blowjobs?" you snicker. "You slut."'
+				'"I <i>have</i> cum from <i>one or two</i> blowjobs before," she says, smacking you with a pillow before grinning back. "But what about you, huh? Do you like giving head?"'
+				gs 'albina_sex_chat', 'blowjob_talk2'
+			end
+			
+			act'"You''re just like my sister"':
+				cla & *nl
+				'"You''re just like my sister, you know that?" you snicker. Albina cocks her head, giving you a confused look. You pull up your hand and start counting off on your fingers.'
+				'"You love taking it up the ass, you love getting face fucked, you love swallowing-"'
+				'"I don''t love swallowing!" Albina interrupts you in protest. "I said I <i>always</i> swallow because I''m not an impolite bitch! There''s a difference!"'
+				'"Suuuure!" You continue to tease her until she picks up a pillow and smacks you with it.'
+				'"Well what about you, huh?" she grins back. "Do you like giving head?"'
+				gs 'albina_sex_chat', 'blowjob_talk2'
+			end
+		end
+		
+!!		gs 'albina_sex_chat', '69_talk1'
+	end
+end
+
+if $ARGS[0] = 'blowjob_talk2':
+	act'You hate it':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I hate giving blowjobs," you say, wrinkling your nose. "The taste is awful, they make my jaw ache, and they''re just gross all around."'
+		'"I can understand that," Albina nods. "They''re not for everybody. I guess I''ve just seen so much cock I''m used to the taste and the ache. Just another part of the process."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'You don''t like it':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I don''t really like it," you say, wrinkling your nose. "They''re not the <i>worst</i> but I don''t get off on them at all. I mostly just sit there bored out of my mind until it''s over."'
+		'"I get that," Albina nods. "If it''s not a skull-fucking, I feel pretty much the same way. Just something you have to do until you get to the good part."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Don''t love it, don''t hate it':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Hmm. I don''t know. It''s okay I guess," you say with a shrug. "I don''t really like them, but I don''t really hate them either. Just kind of something I do. I don''t know. It''s a cock in my mouth. Is there much more to say?"'
+		'"I get that," Albina nods. "If it''s not a skull-fucking, I feel pretty much the same way. Just something you have to do until you get to the good part."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'You like it':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I like it," you say. "Knowing that I''m in charge of a guy''s pleasure is really hot. I like the feeling of them squirming inside my mouth and knowing that it''s because of me."'
+		'"I get that," Albina says with an understanding nod. "Not my personal cup of tea, but I can see the appeal when you put it like that."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'You love it':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I <i>love</i> blowjobs," you gush. "I love everything about them! The feel of a guy''s dick in my mouth, the taste, the smell, the way I can make him moan and squirm. I could get off on giving head."'
+		'"I get that," Albina smirks amusedly. "Not my personal cup of tea, but I can see the appeal when you put it like that."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Only when it''s rough':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I''m like you," you say. "When I''m blowing a guy, it''s just whatever. But when a guy starts getting rough with me-"'
+		'"It''s so fucking hot, right?" Albina interrupts.'
+		'"It''s like a waterfall between my legs," you gush back excitedly. "It makes me want to just go limp and-"'
+		'"Let him grab you with both hands and skullfuck you?"'
+		'"Yes!"'
+		*nl
+		'The conversation quickly turns into a revolving circle of your shared face-fucking fetish.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Only if his dick is small':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I like it..." you start. "But only when a guy''s dick is small enough. When it''s too big it takes so much effort just to get it around my teeth and I feel like I''m gonna choke. An aching jaw is kind of a turn off. But when it''s average or small and I can suck it no problem, blowjobs can be kinda fun."'
+		'"I get that," Albina nods. "Definitely choked on my share of big dicks. Almost threw up several times before I lost my gag reflex."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Only if his dick is big':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I like it when it''s a big dick," you smirk. "There''s something really satisfying about having a big dick in my mouth, making me stretch my lips to get around it. It''s... <i>meaty</i>. As opposed to when it''s small or average, it feels like there''s too much space by comparison."'
+		'"I get that," Albina smiles back amusedly. "I''ve choked on a lot of dick in my time, but always better to choke on a bigger one than a smaller one. Better to get skullfucked with."'
+		'She grins wickedly.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = '69_talk1':
+	act'"Do you like 69ing?"':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Do you like 69ing?" you ask Albina.'
+		'"With a guy or a girl?" she smirks back wickedly.'
+		act'Guy':
+			cla & *nl
+			'"A guy," you say.'
+			'"69ing is just a novelty if you ask me," she sighs, boredly twirling her finger through her hair. "Too much going on at once. I''m sucking dick trying to make him feel good, his face is between my legs, or at least trying to get both because matching dick to mouth and pussy to face is hard at my height, especially if he''s tall. It''s a big hassle and I can''t concentrate on anything. I just give a worse blowjob while getting less pleasure out of being eaten out. <i>If</i> he even is eating me out. And don''t get me started about when the guy''s on top. Trying to suck a dick hanging above you while in a supine position is so much harder than when it''s standing up straight."'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+		
+		act'Girl':
+			cla & *nl
+			'"A girl," you say.'
+			if npc_sex['A23'] = 1:
+				'"It''s... different... When you- I mean we- It made me-"'
+				'Albina flushes, growing flustered in a way you rarely see from her.'
+				'"When we... <i>did that...</i> it was very... wet..." she says slowly. "Not sure I can describe it another way. Everything was soft and squishy and my pussy was like a waterfall and I wanted to drown myself in yours. Really different from 69ing with a guy. Or sex with guys as a whole."'
+			else
+				'"It''s very... wet..." she says slowly. Albina flushes, growing flustered in a way you rarely see from her. "Not sure I can describe it another way. Everything was soft and squishy and my pussy was like a waterfall and I wanted to drown myself in yours. Really different from 69ing with a guy. Or sex with guys as a whole."'
+			end
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'cum_talk1':
+	act'Talk about cum':
+		cla
+		gs 'albina_sex_chat', 'cum_taste1'
+		gs 'albina_sex_chat', 'facial_talk1'
+	end
+end
+
+if $ARGS[0] = 'cum_taste1':
+	act'Do you like the taste?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Do you like the taste of cum?" you ask Albina. She immediately wrinkles her nose.'
+		'"Ew. No." She makes a fake gagging sound. "It''s <i>vile</i>. I brush my teeth the first chance I get after I finish a guy with my mouth. Why? Do you like it?"'
+		gs 'albina_sex_chat', 'cum_taste2'
+	end
+end
+
+if $ARGS[0] = 'cum_taste2':
+	act'It''s gross':
+		cla & *nl
+		'"No, I agree with you one hundred percent," you say, making a face of disgust yourself. "It''s bitter, it''s sour, it''s slimy. I want to throw up as soon as I taste it. It''s just... <i>ugh!</i>"'
+		'The two of you share an involuntary shudder. Seems you''re in agreement.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Don''t mind it':
+		cla & *nl
+		'"I don''t really mind it," you shrug. "It''s a little bitter, not my favourite flavour in the world, but not really a dealbreaker for me either."'
+		'"I don''t know how you can stand it," Albina shakes her head. "I''ve tasted dozens of different guy''s cum and they''re <i>all</i> awful. One of them claimed he ate pineapple just for me, but either he was lying or that stuff about making it taste sweeter is bullshit!"'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'You like it':
+		cla & *nl
+		'"I like it actually," you say. "It''s a little salty, but not offensively so. Like the white part of a fried egg. Similar texture too. I can swallow it no problem."'
+		'"I don''t know how you can stand it," Albina shakes her head. "I''ve tasted dozens of different guy''s cum and they''re <i>all</i> awful. One of them claimed he ate pineapple just for me, but either he was lying or that stuff about making it taste sweeter is bullshit!"'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	if pcs_traits['cumeater'] ! 0:
+		act'You got used to it':
+			cla & *nl
+			'"I just got used to it to be honest," you shrug. "Didn''t like it at first, but after swallowing a bunch of loads, it''s removed any disgust I associated with it."'
+			'"I don''t know how you can stand it," Albina shakes her head. "I''ve tasted dozens of different guy''s cum and they''re <i>all</i> awful. One of them claimed he ate pineapple just for me, but either he was lying or that stuff about making it taste sweeter is bullshit!"'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'facial_talk1':
+	act'Do you like facials?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Do you like it when guys cum on your face?" you ask.'
+		'"Sometimes," Albina shrugs. "When a guy cums on my face, I feel <i>dirty</i>. Like a used cum rag. Which... I don''t mind if I''m in the mood for that kind of thing. Like when Lazar fucks me so hard my hair is frizzy and my makeup is fucked. That''s the perfect time for him to cum on my face. But that''s situational. I''d much rather he just blow his load in my ass. I''m always in the mood for that."'
+		'She grins at you.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'sex_talk_albina_lead':
+	act'Let her lead':
+		cla
+		AlbinaQW['chat_rand'] = rand(1,3)
+		if AlbinaQW['chat_rand'] = 1:
+			'"So what''s your favourite position?" she asks.'
+			act 'Missionary': gt 'albina_sex_chat', 'missionary'
+			act 'Doggystyle': gt 'albina_sex_chat', 'doggystyle'
+			act 'Cowgirl': gt 'albina_sex_chat', 'cowgirl'
+			act 'Blowjobs': gt 'albina_sex_chat', 'bj_fav'
+		elseif AlbinaQW['chat_rand'] = 2:
+			gs'albina_sex_chat', 'birth_control_talk'
+		elseif AlbinaQW['chat_rand'] = 3:
+			gs'albina_sex_chat', 'sex_toys'
+		elseif AlbinaQW['chat_rand'] = 4:
+			gs'albina_sex_chat', 'lesbian_talk1'
+		else
+			gs'albina_sex_chat', 'sexual_fantasies1'
+		end
+	end
+end
+
+if $ARGS[0] = 'missionary':
+	menu_off = 1
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'Missionary," you admit.'
+	'"BO-RING!"'
+	act 'It''s nice!':
+		cla & *nl
+		'"What''s wrong with missionary?" you protest. "I think it''s nice."'
+		'"You''re trying to tell me that lying on your back doing nothing is ''nice''?" She rolls her eyes. "Nuh uh. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
+		gs 'albina_sex_chat', 'missionary2'
+	end
+
+	act 'It''s romantic':
+		cla & *nl
+		'"It''s romantic!" you protest. "You can look up into his eyes when you come. Or kiss while he fucks you. It makes it so much better."'
+		'"Romance is for decrepit old fucks," she rolls her eyes. "Nuh uh. Give it to me <i>dirty</i>. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
+		gs 'albina_sex_chat', 'missionary2'
+	end
+
+	act 'It''s easy':
+		cla & *nl
+		'"It''s easy," you shrug. "I don''t have to do any work. Just lay there and get dicked."'
+		'"Holy <i>fuck!</i> You sound like a dull lay," she rolls her eyes. "I can''t believe you''re the kind of girl who starfishes. Not only that, but you actually <i>like</i> it! Nuh uh. Not me. Give it to me <i>dirty</i>. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
+		gs 'albina_sex_chat', 'missionary2'
+	end
+end
+
+if $ARGS[0] = 'missionary2':
+	pcs_horny += 15
+	gs'stat'
+	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
+	gs'albina_sex_chat', 'sex_talk'
+	act 'Ask her about her anal fetish': gt 'albina_sex_chat', 'anal'
+end
+
+if $ARGS[0] = 'doggystyle':
+	menu_off = 1
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"I like doggystyle."'
+	'"That''s my girl!" Albina cheers excitedly. "What''s your favorite thing about it?"'
+	act 'It''s more intense':
+		cla & *nl
+		'"There''s something <i>intense</i> about it," you say. "Something primal. I can''t explain it, but when I get fucked from behind, it drives me wild."'
+		'"I definitely get that," Albina says. "I love that about it too. All I want from a guy is for him to grab me by the hair, shove his cock up my ass, and spank me until I cum. Best night ever."'
+		gs 'albina_sex_chat', 'doggystyle2'
+	end
+
+	act 'It goes deeper':
+		cla & *nl
+		'"It goes deeper in doggy," you explain. "I feel like it <i>fills</i> me, hitting every part of my insides. It just feels the best in that position."'
+		'"Fuck yeah," Albina says. "Doggy is the only way to <i>really</i> get balls deep inside a girl. And then when you get grabbed by the hair and pulled back even harder? And when he shoves it up your ass and spanks you? Fuck me, I could cum just thinking about it."'
+		gs 'albina_sex_chat', 'doggystyle2'
+	end
+
+	act 'Easy spankings':
+		cla & *nl
+		'"I love getting spanked," you grin.'
+		'"Fuck yeah!" Albina shouts, high fiving you so hard it hurts. "There''s nothing I love more than a cock balls deep up my ass and being spanked until it''s red and tender. If I can still sit down without wincing after, then you didn''t really fuck me."'
+		gs 'albina_sex_chat', 'doggystyle2'
+	end
+end
+
+if $ARGS[0] = 'doggystyle2':
+	pcs_horny += 15
+	gs'stat'
+	'You giggle at her answer, feeling warmth blossoming between your hips and wetness seeping from your pussy. With the "fuck me eyes" Albina is giving you think she''s probably feeling something similar.'
+	gs'albina_sex_chat', 'sex_talk'
+	act 'Ask her about her anal fetish': gt 'albina_sex_chat', 'anal'
+end
+
+if $ARGS[0] = 'cowgirl':
+	menu_off = 1
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"I like cowgirl," you admit.'
+	'"Oh?" She raises an eyebrow curiously. "That''s what you''re into?"'
+	act 'It feels better':
+		cla & *nl
+		'"It just feels better," you shrug. "I don''t know how to explain it. The angle? Just the way it fits inside when I''m on top? It feels good. What can I say?"'
+		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck." She then gives you a sly grin. "But riding dick is a close second for me."'
+		gs 'albina_sex_chat', 'cowgirl2'
+	end
+
+	act 'I like being in control':
+		cla & *nl
+		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
+		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
+		gs 'albina_sex_chat', 'cowgirl2'
+	end
+
+	act 'I like it when he grabs my breasts':
+		cla & *nl
+		'"I like having my boobs grabbed," you grin. "If I''m on top, then his hands are free to grope me."'
+		'"But he can still grab your tits from behind," Albina argues. "Plus, he can spank you until you''re red and wriggling too. Why choose when you can have both?" She gives you a sly grin. "Though I''ll admit, riding dick is a close second for me."'
+		gs 'albina_sex_chat', 'cowgirl2'
+	end
+end
+
+if $ARGS[0] = 'cowgirl2':
+	pcs_horny += 15
+	gs'stat'
+	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
+	gs'albina_sex_chat', 'sex_talk'
+	act 'Ask her about her anal fetish': gt 'albina_sex_chat', 'anal'
+end
+
+if $ARGS[0] = 'bj_fav':
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"I really like giving head," you admit.'
+	'"Ugh, <i>yes!</i>" Albina says, giving you a lustful look. "I love it when guys grab me by the hair and skullfuck me. What do you like about it?"'
+	act'I like being in control':
+		cla & *nl
+		'"It makes me feel like I''m in charge," you grin, though Albina looks back at you confused.'
+		'"In charge?" she asks. "You''re on your knees serving someone else''s needs. What about it makes you feel like you''re in charge?"'
+		'"When a dick is in my mouth, it means I''m in control of all the pleasure," you say. "I can tease him, I can edge him, I can suck him dry, I can make him beg, I choose when to make him come. Plus, I''ve got teeth."'
+		'You flash Albina a wicked grin.'
+		'"When your cock is surrounded by my teeth, <i>I''m</i> the one in charge."'
+		'"Huh. Never thought of it like that..." she smirks back. "Still, can''t do anything about it when they cum in your mouth. I''d rather they just bend me over and blast my ass."'
+		gs 'albina_sex_chat', 'spit_or_swallow'
+	end
+	
+	act'I like being subservient':
+		cla & *nl
+		'"I think I''m just a bit of a sub," you shrug. "I like being on my knees, with his hand on my head, moving me up and down his cock."'
+		'"You''re <i>such</i> a goodie two shoes," Albina teases.'
+		'"... I like it when he calls me a good girl too," you admit and she gives a sharp bark of laughter.'
+		'"I bet. But don''t you ever get tired of swallowing?"'
+		gs 'albina_sex_chat', 'spit_or_swallow'
+		act'Good girls swallow':
+			cla & *nl
+			'"No," you reply without hesitation. "I''m a good girl. And good girls always swallow."'
+			'"Doesn''t mean you always like it," she says, twisting her mouth wistfully.'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+	end
+	
+	act'I like pleasing people':
+		cla & *nl
+		'"I like pleasing people," you shrug. "I love hearing a guy moan while I''m blowing him. It makes me feel so hot and sexy. And when he throbs in my mouth-" You stop, shivering at the thought and grin at Albina. "I could just come thinking about it."'
+		'She smirks back at you.'
+		'"I bet. But don''t you ever get tired of swallowing?"'
+		gs 'albina_sex_chat', 'spit_or_swallow'
+	end
+	
+	act'Oral fixation':
+		cla & *nl
+		'"I think I have some kind of oral fixation," you say. "The feeling of a cock in my mouth just turns me on. I can''t explain it. I like feeling it on my tongue, the taste, I think I even kind of like the way it makes my jaw ache after I''ve been blowing a guy for a long time."'
+		'"I like the ache too," Albina says. "Especially if it''s right after a rough fucking. I like feeling like a used dish rag at the end of a good fuck. But I''d still rather they just blow their load in my ass instead of in my mouth. It gets boring swallowing."'
+		gs 'albina_sex_chat', 'spit_or_swallow'
+		act'Me too':
+			cla & *nl
+			'"Me too," you nod. "There''s something about hot cum shooting up your ass that just..."'
+			'"Exactly," she grins.'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+		
+		act'I prefer creampies':
+			cla & *nl
+			'"I prefer creampies myself," you smirk. You''re about to continue when you notice the color drain from Albina''s face. "What?"'
+			'"Nothing," she says, shrugging like she didn''t just give you a look like she''d seen a ghost. "I was just surprised was all."'
+			act'Let it go':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'She seems spooked for some reason, but you don''t want to make her uncomfortable so you decide to let it go.'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+			
+			act'Pursue it':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'Something is off. Albina is so open about her sex life, it feels strange that she''d be surprised about anything sex related.'
+				'"No really," you insist, pressing on. "What''s so weird about liking creampies?"'
+				'"Nothing!" she snaps. "I said I was just surprised! Why can''t you accept what I tell you you dumb bitch? Fuck off!"'
+				*nl
+				'Your eyes go wide in shock at her sudden flash of anger. Worried she might slap you if you say anything else, you stay silent until she begins talking to you again like nothing happened.'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+		end
+	end
+	
+	act'Everything!':
+		cla & *nl
+		if pcs_traits['cumeater'] = 1:
+			'"Everything!" you grin. "I love pleasing a man. I love hearing him moan. I love being in control of his pleasure. I love the taste of cock. I love insisting that he relax and let me take care of it. I love feeling him get harder in my mouth. I love the intimate connection that we form. And..."'
+			'You trail off, meeting Albina''s eyes.'
+			'"I <i>love</i> the taste of cum."'
+			'"Slut," she smirks.'
+			'"Cumslut," you correct and Albina gives a sharp bark of laughter.'
+			gs 'albina_sex_chat', 'sex_talk'
+		else
+			'"Everything!" you grin. "I love pleasing a man. I love hearing him moan. I love being in control of his pleasure. I love the taste of cock. I love insisting that he relax and let me take care of it. I love feeling him get harder in my mouth. I love the intimate connection that we form. What''s <i>not</i> to love about sucking cock?"'
+			'"Slut," Albina snickers back. "But don''t you ever get tired of swallowing?"'
+			gs 'albina_sex_chat', 'spit_or_swallow'
+		end
+		
+	end
+	
+	if arrsize('$lover') > 0:
+		act'I do it for my boyfriend':
+			cla & *nl
+			'"I like making my boyfriend feel good," you smile. "He likes it, so I like it."'
+			'"Oh puh-leez," Albina rolls her eyes. "If I knew you were going to talk about romantic bullshit like that, I wouldn''t have asked. Romance is for decrepit old fucks."'
+			'Her words come across sharp, but you can see the twinkle in her eye that lets you know she''s just kidding.'
+			'"But seriously. Don''t you ever get tired of swallowing?"'
+			gs 'albina_sex_chat', 'spit_or_swallow'
+		end
+		
+		act'I love my boyfriend':
+			cla & *nl
+			'"Because of my boyfriend," you say, involuntarily smiling as your thoughts drift towards him. "I love him so much and I love seeing the pleasure on his face when his cock is in my mouth. I want to spoil him, so I love giving him head."'
+			'"Oh puh-leez," Albina rolls her eyes. "If I knew you were going to talk about romantic bullshit like that, I woudln''t have asked. Romance is for old decrepit fucks."'
+			'Her words come across sharp, but you can see the twinkle in her eye that lets you know she''s just kidding.'
+			'"But seriously. Don''t you ever get tired of swallowing?"'
+			gs 'albina_sex_chat', 'spit_or_swallow'
+		end
+	end
+end
+
+if $ARGS[0] = 'spit_or_swallow':
+	act'I spit':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"What do you mean?" you say with a puzzled look. "I don''t swallow. I just spit?"'
+		'"What do <i>you</i> mean?" Albina asks, giving you a bemused look right back.'
+		act'It tastes funny':
+			cla & *nl
+			'"It tastes funny," you say matter of factly. "So I just spit it out."'
+			gs 'albina_sex_chat', 'swallow_why'
+		end
+		
+		act'It tastes gross':
+			cla & *nl
+			'"Ugh! No," you grimace in disgust. "It tastes so gross. I could never swallow that swill. I just spit."'
+			gs 'albina_sex_chat', 'swallow_why'
+		end
+		
+		act'It feels weird':
+			cla & *nl
+			'"It feels weird," you shrug. "The flavor is whatever but I can''t get over the texture. It''s like swallowing a load of snot. So I just spit."'
+			gs 'albina_sex_chat', 'swallow_why'
+		end
+		
+		act'Swallowing isn''t my thing':
+			cla & *nl
+			'"Eh, swallowing just isn''t really my thing," you shrug. "Never been into it. Avoid it when I can."'
+			gs 'albina_sex_chat', 'swallow_why'
+		end
+	end
+	
+	act'Not really':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Not really," you shrug. "It''s just part of sex. I don''t really care one way or the other. As long as it makes him happy."'
+		'"I guess," Albina sighs. "Well <i>I</i> get tired of it."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'I got used to the taste':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I got used to the taste after a while," you shrug. "It''s not my favorite thing in the world, but I''m  used to it."'
+		'"I guess I''m like that too," Albina sighs. "Still gets tiring if it''s all a guy wants to do though."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Spitters are quitters':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"Spitters are quitters," you smirk.'
+		'"Well you''ve got that much right," Albina laughs back.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'I like the taste':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I like the taste," you smile. "There''s something satisfying about the thick salty flavor of it."'
+		'"Ew!" She wrinkles her nose in disgust. "You <i>like</i> it?"'
+		'"Yeah. You don''t?"'
+		'"No! It tastes like shit!" Albina fake gags.'
+		'"Then why swallow?"'
+		'"Cause you''re <i>supposed</i> to. Duh."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Makes me feel sexy':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"I love swallowing," you grin. "It makes me feel sexy. Just the look on a guy''s face when you gulp down his load, nngh~! That alone is worth it."'
+		'"Different strokes I guess," Albina says wryly. "Well <i>I</i> get tired of it."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'swallow_why':
+	'"What the fuck?" Albina stares at you like you just said you have a meter long cock. "You <i>never</i> spit. You always swallow."'
+	act'Why would I do that?':
+		cla & *nl
+		'"Why would I do that?" you ask. "Why would I swallow if I don''t want to?"'
+		'"Because you''re <i>supposed</i> to," she insists. "You know what? Let''s just drop it. You''re weird."'
+		*nl
+		'<i>I''m the weird one here?</i> you think to yourself.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'Do you like the taste?':
+		cla & *nl
+		'"Why?" you ask. "Do <i>you</i> like the taste?"'
+		'"No, of course I don''t like the taste!" she says wrinkling her nose. "It''s awful!"'
+		'"Then why swallow?"'
+		'"Cause you''re supposed to. <i>Duh.</i>" Albina gives you another odd look. "You know what? Let''s just drop it. You''re weird. '
+		*nl
+		'<i>I''m the weird one here?</i> you think to yourself.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'birth_control_talk':
+	'"Do you use birth control?" Albina asks you.'
+	if birth_control['think_safe'] = 0:
+		if pillcon2 > 0 and pillcon2 < 36000:
+			'"I just started the pill," you tell her. "But it''s too soon for it to start being effective yet."'
+			'"I''m on the pill too," she nods. "I hate condoms but I''m terrified of getting knocked up so I take them <i>religiously</i>."'
+			act'I want to be extra safe':
+				cla & *nl
+				'"Me too," you say. "Not the condom part but the pregnant part. I insist every guy uses a condom I''m so scared it''s going to break I''m taking the pill just to be extra safe."'
+				'"I get that," Albina replies, staring off into the corner for a few seconds before glancing back at you again.'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+			
+			act'I hate condoms too':
+				cla & *nl
+				'"Me too," you say. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. I can''t wait till I can start going bareback."'
+				'"It''s way better," Albina grins. "You''re gonna love it."'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+			
+			act'I don''t want to worry':
+				cla & *nl
+				'"I just don''t want to worry about it," you sigh. "What if the guy doesn''t have one? What if I don''t have one? What if the condom breaks? He said he''s going to pull out, but what if he doesn''t? It''s too much stress. Easier to just take a pill every day."'
+				'"I would <i>never</i> let a guy to go bareback on me if I wasn''t on the pill," Albina says, looking horrified at you. "You can''t trust them with that shit. For fuck''s sake, I take it up the ass most of the time and I <i>still</i> don''t trust them not to cum in my pussy. You know what I mean?"'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+			
+			act'I love creampies':
+				cla & *nl
+				'"I <i>love</i> creampies," you gush. "Once the pill starts kicking in, I''ll be able to get all the creampies I want."'
+				'"Oh." Albina gulps, looking away.'
+				'"What''s with that reaction? Feeling turned on? You don''t have a creampie fetish, do you?" you snicker teasingly.'
+				*nl
+				'<b>"Fuck off!"</b> Albina shouts, whirling on you with fury in her eyes. "I don''t have a fetish for that shit so <b>shut the fuck</b> up and keep it that way."'
+				*nl
+				'You back off, stunned by her sudden explosion. What the hell was that about?'
+				gs 'albina_sex_chat', 'sex_talk'
+			end
+		else
+			act'None':
+				cla & *nl
+				'"No, I don''t use any kind of birth control," you shake your head and Albina goes visibly pale.'
+				'"What the fuck! Why not? Aren''t you afraid of getting pregnant?"'
+				act'Don''t see the point':
+					cla & *nl
+					'"Just don''t see the point," you shrug, revealing how irresponsible your behavior is. "Taking pills is such a chore and condoms suck. Unprotected sex is more fun."'
+					'"Don''t see the point?!" Albina sputters. She sighs, shaking her head. "I don''t understand you at all."'
+					gs 'albina_sex_chat', 'sex_talk'
+				end
+				
+				act'I want to have a baby':
+					cla & *nl
+					if npc_pregtalk['A23'] = 0:
+						'"What if that''s why I don''t use any?" you smile and Albina''s jaw drops. "I kind of <i>want</i> to have a baby."'
+						if age < 18:
+							'"At our age? Seriously? You''re not even 18! You want to be a teen mom and fuck up your life?"'
+						else
+							'"At our age? Seriously? You want to be a teen mom and fuck up your life?"'
+						end
+						
+						act'I''ll be a great mom':
+							cla & *clr
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+							'"You think I wouldn''t be a great mom?" you ask. "I do."'
+							'"That''s not the point," Albina says, shaking her head. "A kid is a lot of responsibility. They become the priority in your life. They can get in the way of dreams and other things you want to do..."'
+							*nl
+							'She trails off, looking away.'
+							*nl
+							'"Mama had to put a lot of dreams on hold because she got pregnant with me. Because of my shitbag dad, but because of me too. I love Mama, but it wasn''t until she didn''t have to take care of me anymore that she got to actually live her life. Try to remember that before you get pregnant."'
+							gs 'albina_sex_chat', 'sex_talk'
+						end
+						
+						if pcs_lover - pcs_girlfriends > 0:
+							act'I love my boyfriend':
+								cla & *clr
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+								'"But I love my boyfriend so much!" you say. "He''ll be a great dad, I know it."'
+								'"That''s what Mama thought," Albina says with a disapproving look. "Just because a guy seems nice now doesn''t mean he won''t turn into a total fuckbag the moment you''re knocked up. Try to remember that before you get pregnant."'								
+								gs 'albina_sex_chat', 'sex_talk'
+							end
+						end
+					else
+						'"What if that''s why I don''t use any?" Albina''s jaw drops and with a bashful smile you say, "I want another baby."'
+						'"You''re crazy," she says, shaking her head. "I can''t believe you want to push another one of those things out of your pussy. Didn''t it hurt enough the first time?"'
+						'"You''ll understand when you''re a mother," you reply haughtily. Albina gulps and looks away.'
+						'"I haven''t decided if I want kids..." she says, a slight shake in her voice.'
+						gs 'albina_sex_chat', 'sex_talk'
+					end
+				end
+			end
+			
+			act'Condoms':
+				cla & *nl
+				'"Just condoms," you shrug. "No medication though."'
+				'"Ugh, I <i>hate</i> condoms," Albina moans. "That''s why I''m on the pill. Why don''t you switch?"'
+				act'More reliable':
+					cla & *nl
+					'"Condoms are more reliable," you say. "I can''t forget to use a condom like I can forget to take a pill."'
+					'"But condoms can still break," she argues.'
+					'"And I can get too tired and fall asleep before remembering to take my pill," you point out. "In the grand scheme of things, condoms are just safer."'
+					'"I prefer bareback," Albina says, before taking a deep breath and sighing. "But I also take my pill religiously. I set alarms and everything. I guess better to use condoms if you don''t trust yourself to take the pill... Wait, but why not get the shot instead?"'
+					gs 'albina_sex_chat', 'sex_talk'
+				end
+				
+				gs 'albina_sex_chat', 'birth_control_pill_hassle_condom_ver'
+				
+				gs 'albina_sex_chat', 'birth_control_hormones'
+			end
+			
+			act'The pullout method':
+				cla & *nl
+				'"Does the pullout method count?" you grin. Albina looks at you like you just said you want to fuck a fire truck.'
+				'"Seriously?! You would trust a guy with that shit? I take it mostly up the ass and I <i>still</i> take the pill because I don''t trust a guy not to blow his load in my pussy."'
+				act'Condoms suck':
+					cla & *nl
+					'"But condoms are the <i>worst!</i>" you moan. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s bareback or nothing."'
+					'"I hate condoms too, but that doesn''t explain why you won''t just get on the pill?"'
+					
+					gs 'albina_sex_chat', 'birth_control_pill_hassle_no_condoms'
+					
+					gs 'albina_sex_chat', 'birth_control_hormones'
+				end
+				
+				gs 'albina_sex_chat', 'birth_control_pill_hassle_no_condoms'
+					
+				gs 'albina_sex_chat', 'birth_control_hormones'
+			end
+			
+			act'The calendar method and condoms':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"I use the calendar method," you tell her.'
+				'"The <i>what?</i>" Albina stares at you with a confused expression.'
+				'"The calendar method." You begin explaining. "You start by tracking your period and use that to figure out when your cycles are. From then, you can figure out when you''re ovulating and when you''re likely to get pregnant from sex and when it''s safe. I go bareback on safe days and use condoms on danger days."'
+				*nl
+				'"Oh <i>god</i>, it''s the worst of both," she says, grimacing at you. "Condoms <i>and</i> still in danger of being knocked up!"'
+				'"It''s not dangerous," you protest. "Once you have your cycle down, it''s just a matter of keeping track."'
+				'"And if you''re too horny to remember what day it is?" Albina gives you a dead stare.'
+				act'Uhh...':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+					'"Uhh..."  you say dumbly as Albina continues to stare at you.'
+					'"Yeah, that''s what I thought. Why not just start the pill?"'
+					gs 'albina_sex_chat', 'birth_control_pill_hassle_condom_ver'
+					gs 'albina_sex_chat', 'birth_control_hormones'
+					gs 'albina_sex_chat', 'birth_control_pill_problem'
+				end
+				
+				gs 'albina_sex_chat', 'birth_control_pill_problem'
+			end
+			
+			act'The calendar method (no condoms)':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+				'"I use the calendar method," you tell her.'
+				'"The <i>what?</i>" Albina stares at you with a confused expression.'
+				'"The calendar method." You begin explaining. "You start by tracking your period and use that to figure out when your cycles are. From then, you can figure out when you''re ovulating and when you''re likely to get pregnant from sex and when it''s safe. Guys can come inside me on safe days and I make sure to warn them if it''s a danger day so they can pull out."'
+				*nl
+				'"Seriously?! You would trust a guy with that shit?" She looks at you in bewilderment. "I take it mostly up the ass and I <i>still</i> take the pill because I don''t trust a guy not to blow his load in my pussy."'
+				act'Condoms suck':
+					cla & *nl
+					'"But condoms are the <i>worst!</i>" you moan. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s bareback or nothing."'
+					'"I hate condoms too, but that doesn''t explain why you won''t just get on the pill?"'
+					
+					gs 'albina_sex_chat', 'birth_control_pill_hassle_no_condoms'
+					gs 'albina_sex_chat', 'birth_control_hormones'
+				end
+				
+				gs 'albina_sex_chat', 'birth_control_pill_hassle_no_condoms'
+			end
+		end
+	else
+		'"I''m on the pill," you tell her.'
+		'"I''m on the pill too," she nods. "I hate condoms but I''m terrified of getting knocked up so I take them <i>religiously</i>."'
+		act'I want to be extra safe':
+			cla & *nl
+			'"Me too," you say. "Not the condom part but the pregnant part. I insist every guy uses a condom I''m so scared it''s going to break I take the pill just to be extra safe."'
+			'"I get that," Albina replies, staring off into the corner for a few seconds before glancing back at you again.'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+		
+		act'I hate condoms too':
+			cla & *nl
+			'"Me too," you say. "I can''t <i>feel</i> anything when the guy''s wearing a rubber. I want skin on skin contact. It''s so much better bareback."'
+			'"Damn straight," Albina grins, high-fiving you. "Condoms are fucking dumb."'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+		
+		act'I don''t want to worry':
+			cla & *nl
+			'"I just don''t want to worry about it," you sigh. "What if the guy doesn''t have one? What if I don''t have one? What if the condom breaks? He said he''s going to pull out, but what if he doesn''t? It''s too much stress. Easier to just take a pill every day."'
+			'"I would <i>never</i> let a guy to go bareback on me if I wasn''t on the pill," Albina says, looking horrified at you. "You can''t trust them with that shit. For fuck''s sake, I take it up the ass most of the time and I still don''t trust them not to cum in my pussy. You know what I mean?"'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+		
+		act'I love creampies':
+			cla & *nl
+			'"I <i>love</i> creampies," you gush. "When a guy comes inside me, it''s the best feeling in the world. I can feel his cum fill me up inside. Can''t get that with a condom."'
+			'"Oh." Albina gulps, looking away.'
+			'"What''s with that reaction? Feeling turned on? You don''t have a creampie fetish, do you?" you snicker teasingly.'
+			*nl
+			'<b>"Fuck off!"</b> Albina shouts, whirling on you with fury in her eyes. "I don''t have a fetish for that shit so <b>shut the fuck</b> up and keep it that way."'
+			gs 'albina_sex_chat', 'sex_talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'birth_control_pill_hassle_condom_ver':
+	act'Too much hassle':
+		cla & *nl
+		'"Too much hassle," you sigh. "I don''t want to remember to take a pill every day. It''s just easier to put a rubber on the guy''s cock before he fucks me. If the condom breaks, I can just get a morning after pill."'
+		'"I guess that''s fair," Albina concedes. "Just takes one missed day to get knocked up. That''s why I take mine religiously. I set alarms and everything to remind me. But you don''t know what you''re missing out on. Bareback is the best."'
+		*nl
+		'She grins a slutty grin at you.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'birth_control_pill_hassle_no_condoms':
+	act'Too much hassle':
+		cla & *nl
+		'"Too much hassle," you sigh. "I don''t want to remember to take a pill every day. It''s just one more annoying thing to do. I just want to have sex and enjoy it. Besides, I can always get a morning after pill."'
+		'"You''re crazy," Albina says shaking her head. "Condom or bareback, I wouldn''t fuck guys <i>at all</i> if I wasn''t on birth control... but that''s why I need to be on birth control."'
+		*nl
+		'You both erupt into laughter.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'birth_control_hormones':
+	act'No hormones':
+		cla & *nl
+		'"I don''t want to mess with my body like that," you say, shaking your head. "Birth control hormones stop you from getting pregnant, but they do all other kinds of other stuff to you. I hear horror stories from changing your tastes to sudden weight gain to killing your sex drive. Which sort of defeats the point of getting on the pill in the first place."'
+		'"No periods though," Albina smirks. "But I guess you have a point. Since I started the pill, I get a lot wetter than I used to. But that just made surprise buttsex better. All natural lube.'
+		*nl
+		'She grins a slutty grin at you and you both erupt into laughter.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'birth_control_pill_problem':
+	act'Pill has the same problem':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'"The pill has the same problem with memory," you point out. "If I''m too horny to forget a condom, what if I''m too horny to remember my pill? Or too tired?"'
+		'"I guess you have a point there," Albina sighs. "My fear of getting pregnant outweighs my horniness, but I guess not every girl is like that. Some of them are just dumb like you."'
+		'"If your fear is greater than your horniness, then you must be constantly wetting yourself!"'
+		*nl
+		'She whips around, smacking you hard with a pillow. You cackle with glee, laughing harder as her blows pick up speed and force, but she never stops grinning so you know she can''t be that mad.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'sex_toys':
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/talk/anal_dildo.jpg"></center>'
+	'"My mom is always leaving condoms in my room trying to get me to be safe but I hate fucking with a rubber," Albina rolls her eyes. "If I''m gonna take a cock, I want to feel the cock, you know what I mean? But lately I''ve started using the condoms on my dildos instead. Saves me a lot of clean up, especially when I do anal with them."'
+	gs 'albina_sex_chat', 'sex_talk'
+end
+
+if $ARGS[0] = 'lesbian_talk1':
+	if npc_sex['A23'] = 1:
+		'"Have you ever done it with another girl before?" Albina ask you. You raise an eyebrow and she rolls her eyes. "<i>Besides</i> me, obviously."'
+	else
+		'"Have you ever done it with another girl before?" Albina ask you.'
+	end
+	
+!!	if lesbian = 0:
+!!	hornguy6 - not using the variable because I don''t trust it to be seeded correctly
+!!	leaving it up to the player to be honest
+	if npc_sex['A23'] = 1:
+		act'Just you':
+			cla & *nl
+			'"Just you," you say.'
+			'"Me too," she replies, a faint blush coloring her cheeks. "What''s your favorite part about fucking me?"'
+			gs 'albina_sex_chat', 'lesbian_talk2'
+		end
+	else
+		act'No':
+			cla & *nl
+			'"Can''t say I have," you shake your head.'
+			'"Oh. Never mind then," she says turning away from you, a faint blush coloring her cheeks.'
+			act'Keep talking': cla & gs 'albina_sex_chat', 'sex_talk'
+!!			act'Did you want to try?':
+				
+!!			end
+		end
+	end
+end
+
+if $ARGS[0] = 'lesbian_talk2':
+	act'I like your taste':
+		cla & *nl
+		'"I like the way your pussy tastes," you say, licking your lips. Albina shamelessly grins back at you.'
+		'"I like the way I taste too. But you''re pretty tasty yourself."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	act'You''re good at eating pussy':
+		cla & *nl
+		'"When you eat me out," you grin. "How''d you get so good at eating pussy?"'
+		'"I don''t really think about it," she shrugs, but you can tell she''s feeling smug about the compliment. "I''m having too much fun. Maybe I''m good because I like it so much."'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+end
+
+if $ARGS[0] = 'lesbian_talk3':
+
+end
+
+if $ARGS[0] = 'anal':
+	menu_off = 1
+	gs 'stat'
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+	'"So..." you ask sheepishly. "... What is it you like about anal?"'
+	'She gives you a dry look. "And why do you want to know?"'
+	act 'I was just curious':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+		'Oh, it''s just..." You stutter, flustered by her response. "You know there''s... stuff going around school about you?"'
+		'"Oh I know all about that," she says, rolling her eyes.'
+		*nl
+		'"''Albina is just a cheap buttslut whore.'' '
+		'''I bet Albina''s asshole is looser than Lizeveta''s lips!'' '
+		'''I would fuck Albina''s asshole while slapping her juicy cheeks like I''m playing some bongos!'' '
+		'''I bet her pussy is tighter than a nun''s but her asshole could fit an onion!'' '
+		*nl
+		'"I''ve heard it all, but none of the perverted fucking cowards dare mention them in front of me. I just like anal, okay?! I don''t even know why I''m justifying my sex life to you!"'
+		*nl
+		'You''ve clearly hit a nerve and quickly back off, not wanting to get hit yourself.'
+		gs 'albina_sex_chat', 'sex_talk'
+	end
+	
+	if stat['anal'] = 0:
+		act 'I want to try it (shy)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Well..." you stammer. "I... I want to try it and..."'
+			'Albina gives you a hard stare. "And you thought to ask the school buttslut how to do it?"'
+			'You stutter trying to form an answer, and she breaks into laughter.'
+			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
+			*nl
+			gs 'albina_sex_chat', 'anal_questions_shy'
+		end
+		
+		act 'I want to try it (open)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Cause I want to try it," you say and Albina gives you a hard stare.'
+			'"So you thought you should ask the class buttslut about it?"'
+			'"Yeah," you grin without flinching and Albina laughs heartily.'
+			'"Damn <<$pcs_nickname>>! I can''t even scare you for a second, can I? Well, you''re asking the right girl. What do you want to know?"'
+			gs 'albina_sex_chat', 'anal_questions_open'
+		end
+	else
+		act 'I was looking for some advice (shy)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"Well... I- I''ve tried it a few times..." you stammer. "But it''s always been... painful... So I thought could ask-"'
+			'"The class buttslut about it?" she asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
+			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
+			gs 'albina_sex_chat', 'anal_questions_shy'
+		end
+
+		act 'I was looking for some advice (open)':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
+			'"I''ve tried anal a few times, but it''s always painful and not very enjoyable," you explain. "So I thought-"'
+			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" she asks, glaring at you.'
+			'"Well... Yeah," you grin. "Is there a better person to ask than you?"'
+			'Albina laughs heartily and grins back at you.'
+			'"No, you''re probably right about that. I''m the queen of buttfucking. So what is it you want to know?"'
+			gs 'albina_sex_chat', 'anal_questions_open'
+		end
+	end
+end
+
+if $ARGS[0] = 'anal_questions_shy':
+	if stat['anal'] = 0:
+		act 'Where do I start?':
+			cla & *nl
+			'"Well..." you mumble. "Where do I even start?"'
+			'She nods. "Humble question. Good. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			gs 'albina_sex_chat', 'anal_end1'
+		end
+		
+		act 'What position?':
+			cla & *nl
+			'"What... position should I have my first time in?" you ask shyly.'
+			'"You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small," she replies.'
+			gs 'albina_sex_chat', 'anal_end1'
+		end
+		
+		act 'Does it hurt?':
+			cla & *nl
+			'"Does it hurt?" you ask shyly.'
+			'She smiles in reponse. "Oh man, if you''re asking that then you''re <i>definitely</i> not ready. Here''s my advice: Start small."'
+			gs 'albina_sex_chat', 'anal_end1'
+		end
+	else
+		act 'How do you enjoy it?':
+			cla & *nl
+			'"How do you... enjoy it?" you ask, cringing at how badly you phrased it.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
+			gs 'albina_sex_chat', 'anal_end2'
+		end
+	end
+end
+
+if $ARGS[0] = 'anal_questions_open':
+	if stat['anal'] = 0:
+		act 'Where do I start?':
+			cla & *nl
+			'"Where do I even start?" you ask.'
+			'She nods. "Humble question. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			gs 'albina_sex_chat', 'anal_end1'
+		end
+		
+		act 'What''s the best position?':
+			cla & *nl
+			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
+			'She holds her hand up and interrupts you. "You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small."'
+			gs 'albina_sex_chat', 'anal_end1'
+		end
+	else
+		act 'How do you enjoy it?':
+			cla & *nl
+			'"How do you enjoy it?" you ask, cringing at the memories of your past experiences.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
+			'"Yeah. It''s always too painful for me. I can''t even get wet."'
+			gs 'albina_sex_chat', 'anal_end2'
+		end
+	end
+end
+
+if $ARGS[0] = 'anal2':
+	'"Try playing with your asshole while masturbating, just get used to something touching you down there. If you''re feeling brave, try a finger up to your knuckle right when you''re about to cum. Then next time try one from the start. Or a small dildo with lots of lube. Or better yet, a butt plug. Then you can practice all day," she smirks. "Find out what works for you and <i>then</i> try it with real dick, otherwise it''ll be <i>very</i> painful and could put you off trying it again."'
+	gs 'albina_sex_chat', 'anal_end1'
+end
+
+if $ARGS[0] = 'anal_end1':
+	*nl
+	'You thank her for her helpful advice and she continues answering your questions and giving you all the advice she feels you need to know.'
+	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," she says, shamelessly eye fucking you.'
+	gs 'albina_sex_chat', 'sex_talk'
+end
+
+if $ARGS[0] = 'anal_end2':
+	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench around what''s inside you, whether that be a dildo or a fat cock."'
+	'She grins at you. "If you ever want a <i>hands on</i> lesson, then I''m willing to ''teach'' you some things..."'
+	gs 'albina_sex_chat', 'sex_talk'
+end
+
+
+--- albina_sex_chat ---------------------------------

locations/arousal_oneline.qsrc

@@ -0,0 +1,9 @@
+# arousal_oneline
+
+!! For use only for one of arousal calls and not to be used in larger scenes, includes the 'end' call
+
+gs 'arousal', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8], $ARGS[9]
+gs 'arousal', 'end'
+
+--- arousal_oneline ---------------------------------
+

locations/balkon.qsrc

@@ -16,14 +16,14 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/balcony_underwear1.jpg"></center>'
 	end
 
-	'You step out on the balcony. As you step out on the balcony you feel a light breeze making you a bit chilly.'
+	'You feel a light breeze as you step out on the balcony, making you feel a little chilly.'
 
 	if hour >= 0 and hour <= 6:
 		'It''s dark outside. The street lamps brighten the empty streets below.'
 	elseif hour = 7:
-		'The sun is dawning outside, the birds are waking up and are happily chirping.'
+		'A new day is dawning outside and the birds are happily chirping.'
 	elseif hour >= 8 and hour <= 19:
-		'It''s quite nice outside today. The busy streets are reflecting that, there are lot of people walking at a fast pace.'
+		'It''s quite nice outside today and the streets are busy.'
 	elseif hour >= 20 and hour <= 23:
 		'It''s twilight and the street lights are dimly lit. There''s far less movement on the streets.'
 	end
@@ -32,12 +32,12 @@ if $ARGS[0] = 'start':
 		if sosedBalDay ! daystart:
 			if rand(1, 4) = 4:
 				'A neighbor from the opposite building is out on his balcony and looking your way. He''s noticed that you''re naked...'
-				act 'Look at the neighbor':gt 'balkon2', 'sosed'
+				act 'Look at the neighbor': gt 'balkon2', 'sosed'
 			else
-				'A neighbor from the opposite building is out on his balcony and looking your way. You feel a bit creeped out that he''s following you closely with his gaze.'
+				'A neighbor from the opposite building is out on his balcony and looking your way. You feel a little creeped out that he''s following you closely with his gaze.'
 			end
 		else
-			'No one notices that you''re standing naked on your balcony. You feel a bit dejected that no one payed you any attention.'
+			'No one notices that you''re standing naked on your balcony. You feel a little dejected that no one payed you any attention.'
 		end
 	end
 
@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 	
 	act 'Approach the railing':gt 'balkon2', 'niz'
 	
-	if siga >= 1:act 'Light a cigarette':gt 'balkon2', 'kurit'
+	if siga >= 1: act 'Light a cigarette':gt 'balkon2', 'kurit'
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt 'balkon', 'start'
 	if pcs_horny >= 50 and pcs_inhib > 30: act 'Masturbate':gt 'balkon2', 'masopt'	
 end

locations/balkon2.qsrc

@@ -3,21 +3,19 @@
 menu_off = 1
 
 if $ARGS[0] = 'kurit':
-	cla
-	*clr
+	*clr & cla
 	minut += 10
 	gs 'drugs', 'smoke'
 	pcs_sleep += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/kurit.jpg"></center>'
-	'You put the cigarette in your mouth and tightly squeeze it with your lips as you light it. You inhale the smoke by taking a deep breath and holding it in your mouth for a moment. You continue on enjoying the cigarette as it diminishes...'
+	'You put the cigarette in your mouth and tightly squeeze it with your lips as you light it. You inhale the smoke and hold it in for for a second before continuing and enjoying your smoke.'
 
-	act 'Throw the cigarette butt over the railing...':gt 'balkon', 'start'
+	act 'Throw the cigarette butt over the railing': gt 'balkon', 'start'
 end
 
 if $ARGS[0] = 'demo1':
-	cla
-	*clr
+	*clr & cla
 	sosedBalDay = daystart
 	gs 'stat'
 	'<center><font size="5" color="maroon"><b>Balcony</b></font></center>'
@@ -30,17 +28,15 @@ if $ARGS[0] = 'demo1':
 		gs 'arousal', 'flash', 5, 'exhibitionism'
 	end
 
-	'<center>You defiantly pose on the balcony, to the delight of your neighbor. He eagerly looks at you while furiously masturbating. 5 minutes later he cums and returns to his apartment.</center>'
-	
+	'<center>You defiantly pose on the balcony, much to the delight of your neighbor. He eagerly looks at you while furiously masturbating before he cums and returns to his apartment.</center>'
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Further':gt 'balkon', 'start'
+	act 'Continue': gt 'balkon', 'start'
 end
 
 if $ARGS[0] = 'palec1':
-	cla
-	*clr
+	*clr & cla
 	pcs_horny += rand(10,30)
 	minut += 1
 	sosedBalDay = daystart
@@ -49,14 +45,13 @@ if $ARGS[0] = 'palec1':
 	if $pantyworntype ! 'none':'<center><img <<$set_imgh>> src="images/pc/reactions/fuckyou_underwear.jpg"></center>'
 	if $pantyworntype = 'none':'<center><img <<$set_imgh>> src="images/pc/reactions/fuckyou_naked.jpg"></center>'
 
-	'<center>You flip off the neighbor. As he''s been found out he quickly heads back indoors.</center>'
+	'<center>You flip off the neighbor, who quickly heads back indoors.</center>'
 
-	act 'Further':gt 'balkon', 'start'
+	act 'Further': gt 'balkon', 'start'
 end
 
 if $ARGS[0] = 'niz':
-	cla
-	*clr
+	*clr & cla
 	minut += 5
 	gs 'stat'
 
@@ -71,7 +66,7 @@ if $ARGS[0] = 'niz':
 		end
 
 		act 'Enjoy the view':
-			cls
+			cla
 			if hour >= 8 and hour <= 19:
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bal1.jpg"></center>'
 			else
@@ -83,23 +78,22 @@ if $ARGS[0] = 'niz':
 			act 'Further':gt 'balkon', 'start'
 		end
 	else
-		'This was probably a bad decision, you feel a bit light headed as you had no idea that your apartment was so high. You don''t feel comfortable standing on your balcony while being drunk...'
+		'This was probably a bad decision. You feel a little light headed and don''t feel comfortable standing on your balcony drunk...'
 
-		act 'Further':gt 'balkon', 'start'
+		act 'Continue': gt 'balkon', 'start'
 	end
 end
 
 if $ARGS[0] = 'sosed':
-	cla
-	*clr
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><b><font color="maroon">Balcony</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sosed.jpg"></center>'
-	'<center>You notice your neighbor to the left standing on his balcony. As he notices that you''re naked he begins staring at you…</center>'
+	'<center>You notice your neighbor to the left standing on his balcony, staring at your naked body.</center>'
 	
 	if exhibitionist_lvl > 0:
-		act 'Show off your body':gt 'balkon2', 'demo1'
+		act 'Show off your body': gt 'balkon2', 'demo1'
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Flip him off (<<will_cost>> Willpower)':
@@ -123,33 +117,27 @@ if $ARGS[0] = 'sosed':
 		else	
 			act 'Show off your body (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act 'Flip him off ':gt 'balkon2', 'palec1'
+		act 'Flip him off': gt 'balkon2', 'palec1'
 	end
 	
 end
 
 !!!Probably CV edition
 if $ARGS[0] = 'masopt':
-	cla
-	*clr
-	gs 'stat'
+	*clr & cla
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
 	pcs_mood += 15
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_dildo.jpg"></center>'
 
 	if dildo = 1:
 		act 'Rub your clit with the dildo':
-			cla
-			*clr
+			*clr & cla
 			pcs_vag += rand(0, 2)
-
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_dildo<<rand(1, 2)>>.jpg"></center>'
-
-			'You begin to rub yourself, having your hand moving in small circles as you feel your wetness growing. Feeling aroused enough you take out your dildo and begin teasing your clit by gently rubbing the area.'
-			'As you stop teasing yourself, you slowly push the head inside your vagina. You slowly begin to fuck yourself picking up the pace. The feeling of your inside being stretched out is great and you let out a quiet wimp as you keep on playing with the dildo.'
+			'You start rubbing yourself, gradually building up a wetness between your legs. Feeling aroused enough, you take out your dildo and start teasing your clit by gently rubbing it.'
+			'You then slowly push the head inside your pussy and start slowly fucking yourself, gradually picking up the pace. The feeling of your pussy being stretched out is overwhelming and you let out a quiet whimper as you continue fucking yourself.'
 			$orgasm_or = 'yes'
-			$orgasm_txt = 'After pleasuring yourself intensely with the dildo for a few minutes and as you reach orgasm you try to keep your voice down as you don''t want to get exposed.'
-			
+			$orgasm_txt = 'After pleasuring yourself intensely with the dildo for a few minutes, you try to keep your voice down as you reach orgasm.'
 			gs 'arousal', 'vaginal_dildo', 10, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -158,94 +146,81 @@ if $ARGS[0] = 'masopt':
 		end
 
 		act 'Play with your ass':
-			cla
-			*clr
-			pcs_ass += rand(0, 2)
+			*clr & cla
+			pcs_ass += rand(0,2)
 			'<center><video autoplay loop src="images/locations/city/residential/apartment/sex/balcony_anal1.mp4"></video></center>'
-			'You begin rubbing yourself building up a wetness between your legs. As you''re playing with your clit your horniness takes over and you begin fantasizing on using a different hole today...'
-			'As you keep inserting your fingers inside the vagina, it keeps building up a wetness making your fingers wet and slippery. As you pull out your fingers you begin brushing one of your fingers against the sphincter, giving yourself a little tickle.'
-			'Before you know it you take a deep breath and insert one of your finger in your anus, probing it as it gives you a jolting sensation...'
-			
+			'You start rubbing yourself, gradually building up a wetness between your legs. As you play with your clit, your horniness takes over and you start fantasizing about using a different hole today...'
+			'You brush one of your wet fingers against your anus before you take a deep breath and insert it, probing your ass as a wave of pleasure flows through you.'
 			gs 'arousal', 'anal_finger', 5, 'exhibitionism'
 			gs 'stat'
 
 			act 'Use the dildo':
-				cla
-				*clr
+				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/residential/apartment/sex/balcony_anal2.mp4"></video></center>'
-				'As you''re pleasuring yourself inserting the finger in and out, you grab your dildo and begin sucking on it, trying to lube it as much as you can.'
-				'Not being able to contain yourself you remove the dildo from your mouth and slowly insert it into your anus. At first you feel discomfort but the amazing feeling as the dildo penetrates makes you forget all about it.'
-				'As your anus eases you start to pump away the dildo at a faster speed. The sexual pleasure you''re experiencing is greater than anything you''ve ever known would be possible to feel.'
+				'As you''re pleasuring yourself with your finger, you grab your dildo and start sucking it, trying to lube it as much as you can.'
+				'Not able to contain yourself, you remoce your finger and slowly insert the dildo into your ass. You feel discomfort at first, but the pleasant feeling of the dildo penetrating you makes you forget all about it.'
+				'As your anus relaxes, you start thrusting the dildo at a faster speed, gradually feeling your arousal growing.'
 				
 				$orgasm_or = 'yes'
-				$orgasm_txt = 'Within seconds an orgasm overwhelms you in a long, slow, intense wave after wave of pure pleasure.'
-				
+				$orgasm_txt = 'Within seconds, an orgasm overwhelms you in an intense wave of pure pleasure.'
 				gs 'arousal', 'anal_dildo', 5, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Go back':gt 'balkon', 'start'
+				act 'Go back': gt 'balkon', 'start'
 			end
 		end
 	end
 
 	act 'Masturbate':
-		cla
-		*clr
-		pcs_vag += rand(0, 1)
+		*clr & cla
+		pcs_vag += rand(0,1)
 		gt 'balkon2', 'finger'
 	end
 end
 
 if $ARGS[0] = 'finger':
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-1.jpg"></center>'
-	'Standing naked in the open is making you aroused. Feeling embolded you engulfing your fingers into your mouth preparing them for what''s to come.'
-	
+	'Standing naked in the open is arousing you. Feeling emboldened, you stick your fingers in your mouth, preparing them for what''s to come...'
 	gs 'arousal', 'foreplay', 2, 'exhibitionism', 'masturbate'
 	gs 'stat'
 
 	act 'Rub your clit':
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-2.jpg"></center>'
-		'As the fingers are coated in saliva, you run your fingers down your body not stopping before your juicy puffed pussy lips. You take your fingers and slowly begin rubbing your clit as you feel the first surge of pleasure consuming you.'
+		'You run your wet fingers down your body and stop at your pussy lips. You slowly start rubbing your clit as you feel the first surge of pleasure consuming you.'
 		$orgasm_or = 'no'
 		gs 'arousal', 'clit_finger', 3, 'masturbate', 'exhibitionism'
 		gs 'stat'
 
-		act 'Insert fingers':
-			cla
-			*clr
+		act 'Insert your fingers':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-3.jpg"></center>'
-			'As you play with yourself you begin to rub your clit a little bit faster. By now your clit is swelling with desire, and as you can''t ignore it anymore, you take your middle finger and insert it into your vagina.' 
-			'As you ease into it you shut your eyes by the pleasant feeling as you speed up your hand movements.'
+			'Your clit is now swelling with desire, and you can''t ignore it any longer. You take your middle finger and insert it into your pussy.' 
+			'As you ease into it, you close your eyes as you speed up your movements.'
 			
 			$orgasm_or = 'no'
 			gs 'arousal', 'vaginal_finger', 5, 'masturbate', 'exhibitionism'
 			gs 'stat'
 
 			act 'Open your eyes':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-4.jpg"></center>'
 				if exhibitionist_lvl > 0:
 					gs 'arousal', 'flash', 2
-					'As you open your eyes, you lock eyes with one of your neighbors peering out the window in the house across...'
-					'You can''t help but smile as there''s someone enjoying the show...'
-					
-					act 'Give him a show':gt 'balkon2', 'finger_solo'					
+					'When you open your eyes, you notice one of your neighbors peering out the window at you.'
+				
+					act 'Give him a show': gt 'balkon2', 'finger_solo'					
 				else
 					$orgasm_or = 'yes'
-					$orgasm_txt = 'Overtaken by the thrill of the risk of being caught in such a compromising act and the diligent work of your skilled fingers brings you to an intense orgasm. Before you know it you grip the railing for support as your juices squirt hard out of you.'
-					'The orgasm is so intense that you''re seeing stars and it almost feels like you''re going to pass out. Somehow you manage to keep your composure as you quickly head back inside as you feel too exposed.'
-					
+					$orgasm_txt = 'Overtaken by the thrill of the risk of being caught in such a compromising act and the diligent work of your skilled fingers, you bring yourself to to an intense orgasm. You grip the railing for support as your juices squirt out of you.'
+					'Your orgasm is so intense that you''re seeing stars and it almost feels like you''re going to pass out. You somehow manage to keep your composure before you quickly head back inside.'
 					gs 'arousal', 'clit_finger', 2, 'masturbate'
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Head back inside':dynamic $brodils
+					act 'Head back inside': dynamic $brodils
 				end
 			end
 		end
@@ -253,77 +228,69 @@ if $ARGS[0] = 'finger':
 end
 
 if $ARGS[0] = 'finger_solo':
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-5.jpg"></center>'
-	'Ignoring everything around you, you re-focus on yourself once again. You begin teasing yourself, pressing your fingers on your already throbbing clit. It doesn''t take long before you slide your fingers inside the pussy, as you begin to squirm by the sensation.'
+	'Ignoring everything around you, you re-focus on yourself once again and start teasing yourself, pressing your fingers on your already throbbing clit. It doesn''t take long before you slide your fingers inside your pussy, causing you to squirm at the sensation.'
 
 	$orgasm_or = 'no'
 	gs 'arousal', 'clit_finger', 3, 'masturbate', 'exhibitionism'
 	gs 'stat'
 
 	act 'Keep it up':
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-6.jpg"></center>'
-		'Slowly pacing the speed your fingers enter your pussy, you begin to feel you tight walls becoming wet and sticky with your own juices as it drips onto the ground while your mind is obsessed by the feeling that you need to increase the pace."'
+		'Slowly pacing the speed at which your fingers enter your pussy, you feel your tight walls becoming wet and sticky with your own juices as they drip onto the ground.'
 
 		$orgasm_or = 'no'
 		gs 'arousal', 'vaginal_finger', 3, 'masturbate', 'exhibitionism'
 		gs 'stat'
 
 		act 'Faster':
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-7.jpg"></center>'
-			'You pick up the pace as you begin fantasizing about being taken like this in the open... You use your finger frantically as it slides in and out of your vagina with ease.'
+			'You pick up the pace as you fantasize about being taken like this in the open, your finger frantically sliding in and out of your soaking wet pussy with ease.'
 
 			$orgasm_or = 'no'
 			gs 'arousal', 'vaginal_finger', 3, 'masturbate', 'exhibitionism'
 			gs 'stat'
 
 			act 'Faster':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-8.jpg"></center>'
-				'You are way too horny to pace yourself now, as you use one more finger to stretch out your inside, expanding the pleasant feeling. While trying your hardest to keep as quiet as possible, the walls begin to crumble as you begin moaning making sure that your closest neighbours can hear you.'
+				'You''re way too horny to pace yourself now and insert another finger, expanding the pleasant feeling.'
 
 				$orgasm_or = 'no'
 				gs 'arousal', 'vaginal_finger', 3, 'masturbate', 'exhibitionism'
 				gs 'stat'
 
 				act 'Just a little more':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-9.jpg"></center>'
-					'By now you''re loudly moaning not caring if anyone hears you as your fingers inside are hitting your g-spot. You make one last effort and pump your vagina as you feel a...'
+					'By now, you''re loudly moaning, not caring if anyone hears you as your fingers hit your g-spot. You make one last effort and thrust your fingers deep inside you as you feel a...'
 
 					$orgasm_or = 'no'
 					gs 'arousal', 'vaginal_finger', 3, 'masturbate', 'exhibitionism'
 					gs 'stat'
 
 					act 'Climax':
-						cla
-						*clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_orgasm.jpg"></center>'
-						
 						$orgasm_or = 'yes'
-						$orgasm_txt = 'Within seconds your toes curl as you feel a wave of ecstasy sweeping all over your body, your legs and hands are shaking in delight of a possibility that someone might have noticed you.'
-						'After a few moments you withdraw your fingers from your stretched vagina, still pulsating from the intense orgasm.'
+						$orgasm_txt = 'Within seconds, your toes curl as you feel a wave of ecstasy sweeping all over your body, your legs and hands shaking in delight of a possibility that someone might have noticed you.'
+						'After a few seconds, you remove your fingers from your pussy, which is still pulsating from the intense orgasm.'
 						gs 'arousal', 'vaginal_finger', 3, 'masturbate', 'exhibitionism'
 						gs 'arousal', 'end'
 						gs 'stat'
 
 						act 'Get dressed':
-							cla
-							*clr
+							*clr & cla
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/balcony_mas1-10.jpg"></center>'
-							'As you come to your senses you can hear some of your neighbours applauding your performance. You decide giving them one last show as you stand up and suck the sticky cream slowly from your fingers, savouring the memory.'
-							'As you finish you give everyone a playful wave as you get dressed.'
+							'As you come to your senses, you can hear some of your neighbours applauding your performance. You decide giving them one last show as you stand up and slowly suck your juices from your fingers, savouring the memory.'
+							'As you finish, you give everyone a playful wave as you get dressed.'
 
-							act 'Leave':gt 'balkon', 'start'
+							act 'Leave': gt 'balkon', 'start'
 						end
 					end
 				end

locations/bass.qsrc

@@ -126,23 +126,25 @@ if $ARGS[0] = 'a':
 		end
 	end
 
-	act 'Take a swim (1:00)':
-		cla
-		*clr
-		pcs_makeup = 1
-		cumspclnt = 10
-		gs 'cum_cleanup'
-		gs 'exercise', 'tier1', 60, 'stren'
-		pcs_sweat = 10 + rand(0,4)
-		if pcs_inhib < 50:inhib_exp += rand(1,2)
-		if func('body_din','pregnancyVisibility') = 0:
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Take a swim (1:00)':
+			cla
+			*clr
+			pcs_makeup = 1
+			cumspclnt = 10
+			gs 'cum_cleanup'
+			gs 'exercise', 'tier1', 60, 'stren'
+			pcs_sweat = 10 + rand(0,4)
+			if pcs_inhib < 50:inhib_exp += rand(1,2)
+			if func('body_din','pregnancyVisibility') = 0:
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+			end
+			'You take a swim in the pool, which invigorates you, making you feel refreshed.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+			act 'Get out of the water':gt 'bass', 'start'
 		end
-		'You take a swim in the pool, which invigorates you, making you feel refreshed.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-		act 'Get out of the water':gt 'bass', 'start'
 	end
 
 	act 'Leave':gt 'bass', 'start'

locations/bed.qsrc

@@ -1,7 +1,6 @@
 # bed
 if $ARGS[0] = 'start':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	shour = 24 - hour
 	gs 'stat'
@@ -13,8 +12,7 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'mast':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	if pcs_inhib < 30:inhib_exp += rand(1,3)
 	pcs_mood += 15
@@ -23,24 +21,22 @@ if $ARGS[0] = 'mast':
 	if husband > 0 and STRPOS('bedr,bedr2x,korr,korr2x',$loc) > 0 and husbandrink ! 10:
 		if dildo > 0:
 			if week > 5 or (week < 6 and hour > 16):
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m21.jpg"></center>'
-				'You bend over and start fucking your pussy with your dildo'
-				
+				'You bend over and start fucking your pussy with your dildo.'
 				gs 'arousal', 'vaginal_dildo', 15
 				gs 'stat'
 
-				if hour > 22 or hour < 7:'<<$husName>> looks at you, obviously a little dumbfounded.'
+				if hour > 22 or hour < 7:'<<$husName>> looks at you, a little dumbfounded.'
 				if hour >= 7 and hour <= 22:'Once you get into it, <<$husName>> enters the room.'
 				if harakHusb = 0:
-					'"What are you doing dear?" he asks.'
-					'"I''m sorry dear, but I really need it, and you''ve been busy, " you reply, without stopping.'
+					'"What are you doing?" he asks.'
+					'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
 					'"How often do you do this?" he asks.'
-					'"Quite often, sometime in my ass, you want to see?" you ask'
+					'"Quite often, sometimes in my ass. you want to see?" you ask.'
 					if izvratH = 0:
 						husband -= 1
-						'"I''ll wait outside the door until you''re done." he says and leaves. You continue to satisfy yourself rapidly, and soon finish.'
+						'"I''ll wait outside the door until you''re done," he says and leaves. You continue to satisfy yourself rapidly, and soon finish.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'clit_finger', 5, 'masturbate'
 						gs 'arousal', 'end'
@@ -48,28 +44,25 @@ if $ARGS[0] = 'mast':
 
 						act 'Finish':gt 'bed', 'start'
 					elseif izvratH = 1:
-						'"Well, I don''t know." he stammers.'
-						'"Come on." You encourage him'
+						'"Oh. I don''t know..." he stammers.'
+						'"Come on," you encourage him.'
 
-						act 'Show':
-							cla
-							*clr
+						act 'Show him':
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
-							'You pull the dildo from your pussy and winking at your husband, insert the dildo in your anus. <<$husName>> watches closely as the dildo disappears in and out of your ass.'
-							'You see how his pants swell. "Anything else you want, dear?" you ask, smiling.'
+							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as the dildo disappears into your ass.'
+							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
 							'"Can I join?" he asks, a little embarrassed.'
 							gs 'arousal', 'anal_dildo', 5, 'masturbate'
 							gs 'stat'
 
 							act 'Invite':
-								cla
-								*clr
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m23.jpg"></center>'
-								'<<$husName>> gets his dick out and starts masturbating. It is not what you expected, and at first you feel a little sad that he didn''t enter into you, but began to masturbate.'
-								'Then it starts to hit you, watching your husband masturbate as he watches you fuck the dildo, his face covered in pleasure, you scream and fall on the table, having experienced an orgasm.'
-								'The dildo is still sticking out of your ass. While <<$husName>> is still masturbating, looking at you stretched out on the table, you take the dildo from your ass and begin to lick it, looking into your husbands eyes.'
-								'The spectacle has him immediately cum all over the floor. You go to him, kiss him on the lips and he passionately kisses you back...'
-
+								'<<$husName>> gets his dick out and starts masturbating. It''s not what you expected and you feel a little sad that he isn''t fucking you as you start to masturbate.'
+								'You watch your husband masturbate as he watches you, his face covered in pleasure, before you scream and fall on the table, having experienced an orgasm.'
+								'<<$husName>> is still masturbating, looking at you stretched out on the table before you take the dildo out of your ass and start lick it while looking into his eyes.'
+								'The spectacle has him immediately cum all over the floor before you walk over to him and kiss him on the lips. He passionately kisses you back.'
 								gs 'arousal', 'anal_dildo', 5, 'masturbate'
 								$orgasm_or = 'custom'
 								gs 'arousal', 'end'
@@ -81,50 +74,46 @@ if $ARGS[0] = 'mast':
 					end
 				elseif harakHusb = 1:
 					'"Are you trying to tell me that I''m not enough to satisfy you?" He asks.'
-					'"I''m sorry dear, but I really need this, and you''ve been busy." You reply, without stopping.'
-					'"Well then, show me everything now that you know I''ll watch." He says.'
-					'"Want to see me do it in the ass, too?" You offer.'
+					'"I''m sorry dear, but I really need this, and you''ve been busy," you reply without stopping.'
+					'"Well then, show me everything now that you know I''ll watch," he says.'
+					'"Want to see me do it in the ass too?" you offer.'
 
 					if izvratH = 0:
 						husband += 1
 						husbizvradd += 1
-						'"No, I think this is enough." He says, sits down on a chair and begins to watch. You continue to satisfy yourself rapidly and soon finish in front of her husband.'
+						'"No, I think this is enough," he says as he sits on a chair and starts watching you. You continue to satisfy yourself rapidly and soon finish in front of him.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'clit_finger', 5, 'masturbate'
 						gs 'arousal', 'end'
-						'<<$husName>> stands up and begins to applaud "Bravo, encore?" he laughs.'
-						'"For such a lovely audience, anything, but first an intermission." You laugh. <<$husName>> helps you down from the table.'
-
 						gs 'stat'
-						
-						act 'Finish':gt 'bed', 'start'
+						'<<$husName>> stands up and playfully claps. "Bravo! Encore?" he laughs.'
+						'"Anything for such a lovely audience, but first an intermission," you laugh and <<$husName>> helps you down from the table.'
+
+						act 'Finish': gt 'bed', 'start'
 					elseif izvratH = 1:
 						husband += 1
-						'"Well then, I think you better show me." he said.'
-						'"As you wish." you said'
+						'"Well then, I think you better show me," he says.'
+						'"As you wish," you reply.'
 
 						act 'Show':
-							cla
-							*clr
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m22.jpg"></center>'
-							'You pull the dildo out of your pussy and winking at your husband, insert it in your anus. <<$husName>> watches closely as you pump the dildo in and out of your ass.'
-							'You see how his pants swell. "Anything else you want, dear?" you ask, smiling.'
-							'"I don''t just want something, I''ll do something." He says, unbuttoning his pants and brings his cock to your mouth.'
+							'You pull the dildo out of your pussy and, winking at your husband, insert it into your ass. <<$husName>> watches closely as you slide the dildo in and out of your ass.'
+							'You see how his pants swell. "Anything else you want, dear?" you ask while smiling.'
+							'"I don''t just want something, I''ll do something!" he replies, unbuttoning his pants and brings his cock to your mouth.'
 							gs 'arousal', 'anal_dildo', 5
 							gs 'stat'
 
 							act 'Suck him':
-								cla
-								*clr
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
-								'You take his flaccid penis in your mouth and start sucking, while you continue to drive the dildo into your ass.'
+								'You take his flaccid penis in your mouth and start sucking while continuing to drive the dildo into your ass.'
 								'When his cock has finally hardened, <<$husName>> stops you. "Now I''ll take this hole."'
-
 								gs 'arousal', 'clit_finger', 5
 								gs 'arousal', 'bj', -5
 								gs 'stat'
 						
-								act 'Substitute ass':
+								act 'Get fucked in the ass':
 									picrand = 89
 									gt 'sex', 'anal'
 								end
@@ -132,38 +121,34 @@ if $ARGS[0] = 'mast':
 						end
 					elseif harakHusb = 2:
 						'"Itchy hole?" he asks.'
-						'"I''m sorry dear, but I really need it, and you''ve been busy." You reply, without stopping.'
+						'"I''m sorry dear, but I really need it, and you''ve been busy," you reply without stopping.'
 
 						if izvratH = 0:
 							husband += 1
 							husbizvradd += 1
-							'"You should have said something, now open your mouth." He says pulling out his cock and forcefully pushes it into your mouth.'
-							'He holds you by the hair and fucks your mouth, telling you not to stop masturbating. Soon he tires of your mouth, "Now enough of this rubber shit, I''m going to fuck you."'
-
+							'"You should have said something. Now open your mouth," he says while pulling out his cock and forcefully pushing it into your mouth.'
+							'He holds you by the hair and fucks your mouth, telling you not to stop masturbating before he tires of your mouth. "Enough of this rubber shit! I''m going to fuck you."'
 							gs 'arousal', 'vaginal_dildo', 10
 							gs 'arousal', 'bj', -10
 							gs 'stat'
-								
+						
 							act 'Spread your legs ':
 								picrand = 89
 								gt 'sex', 'vag'
 							end
 						elseif izvratH = 1:
 							husband += 1
-							'"You''re going to insert this stupid toy in your pussy, ass and mouth, You''ll pulverize them, for as long as I like." He says, sitting down to watch.'
-							'Submissively, you quickly use the dildo to fuck your pussy, ass and mouth.'
-							
+							'"You''re going to insert this stupid toy into your pussy, ass and mouth. You''ll pulverize them for as long as I like," he says while sitting down to watch.'
+							'You quickly and submissively do as you''re told.'
 							gs 'arousal', 'vaginal_dildo', 5
 							gs 'arousal', 'anal_dildo', -5
 							gs 'stat'
 
-							act 'Offer mouth':
-								cla
-								*clr
+							act 'Offer your mouth':
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/m24.jpg"></center>'
 								'Still using the dildo on your pussy and ass, you offer <<$husName>> your mouth. He gets up and walks over to you.'
-								'You take his flaccid penis and start sucking, until his cock is finally hard. <<$husName>> stops you, "Now I''ll fuck your ass."'
-
+								'You take his flaccid penis and start sucking until his cock is finally hard and he stops you. "Now I''ll fuck your ass."'
 								gs 'arousal', 'vaginal_dildo', 5
 								gs 'arousal', 'anal_dildo', 5
 								gs 'arousal', 'bj', -10
@@ -179,12 +164,10 @@ if $ARGS[0] = 'mast':
 				end
 			else
 				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-				'Unable to control yourself anymore you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time to attach the suction base of the dildo onto the floor before lowering yourself slowly to it''s tip.'
-				'Shivers run down your spine as you feel that thick head spreading your pussy-lips and soon the whole length begin to slide deep inside your hole. A throaty moan overwhelms the room when that delicious cock finally bottoms out in your cunt, sending you to the heavens and back.'
-				'After shifting your legs and getting more comfortable you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts- soon hammering your ass against the cold floor time and time again. It takes you just a few minutes to reach that so wanted orgasm, your toes curling tightly as that wonderful feeling run through your entire body...'
-				'Soon you''re twitching onto that dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face after cumming so hard there. That was just what you needed!'
-
-				
+				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+				'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+				'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
 				$orgasm_or = 'custom'
 				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
@@ -214,51 +197,45 @@ if $ARGS[0] = 'rab':
 	minut += 120
 	houserabday = daystart
 	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r0.jpg"></center>'
-	'Once you get into bed your mistress comes into the room. "What, my bitch is going to sleep?" She snaps from the doorway.'
-	'"Yes." You reply.'
-	'"Yes, who?" She continues.'
-	'"Yes, mistress." You reply and sit on the bed, she is drunk and barely able to stand on her feet. She is drinking wine from the bottle and spilling quite a bit of it.'
-	'"That''s better, but today you have to be punished." She lifts up her skirt and out pops the strap-on. "Suck it." She commands.'
+	'Once you get into bed, your mistress comes into the room. "What, my bitch is going to sleep?" she snaps from the doorway.'
+	'"Yes..." you meekly reply.'
+	'"Yes, who?" she continues.'
+	'"Yes, mistress..." you reply and sit on the bed. She''s drunk and barely able to stand on her feet as she drinks wine from the bottle, spilling quite a bit of it on the floor.'
+	'"That''s better, but today you have to be punished." She lifts up her skirt and out pops the strap-on. "Suck it," she commands.'
 
 	act 'Suck it':
-		cla
-		*clr
-
+		*clr & cla
+		
 		if analplugIN = 1:analplugIN = 0
 		if pcs_makeup ! 1 and cosmetic_tattoo = 0:pcs_makeup = 0
 
 		'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r1.jpg"></center>'
-		'You take the strap-on in your mouth and start sucking her off. You dislike the taste of rubber and proceed without much enthusiasm. Mistress, though she''s drunk, notices that you''re not trying and starts to thrust along with your movements, driving it deeper into your mouth. You start gagging and don''t like it.'
-		'"Oh damn stubborn bitch, lay down on the bed quickly." With these words, she forcefully pushes you on the bed.'
-
+		'You take the strap-on in your mouth and start sucking her off without much enthusiasm. Mistress, though she''s drunk, notices that you''re not trying and starts to thrust along with your movements, driving it deeper into your mouth and causing you to gag.'
+		'"Oh, damn stubborn bitch! Lie down on the bed. Quickly." She forcefully pushes you on the bed.'
 		gs 'arousal', 'bj', 5, 'sub', 'lesbian'
 		gs 'stat'
 		
-		act 'Lie':
-			cla
-			*clr
+		act 'Lie down':
+			*clr cla
 			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
-			'You lay on the bed and she climbs on top of you and kneels over your face. She makes you open your mouth and forcefully shoves the strap-on in. You try to pull away, but it''s useless, her hands hold your head firmly. She continues to violate your mouth, hardly allowing you to catch a breath of air while she thrust it deeper and deeper. Eventually starting to slip down your throat, cutting off your breath completely. When you''re starting to lose consciousness she takes it out of your throat allowing you to roll onto your side, wheezing sniffling.'
-			'"And now for the punishment, get up bitch." she says. "And what was that just now then?" You think, but you don''t dare to utter that thought.'
-
+			'You lay down on the bed and she climbs on top of you and kneels over your face. She makes you open your mouth and forcefully shoves the strap-on in. You try to pull away, but her hands hold your head firmly. She continues to violate your mouth, hardly allowing you to catch a breath of air while she thrust it deeper and deeper, eventually sliding it down your throat, cutting off your breath completely. When you start to lose consciousness, she finally takes it out, allowing you to roll onto your side, wheezing and sniffling.'
+			'"And now for the punishment. Get up, bitch!" she demands.'
 			gs 'arousal', 'bj', 5, 'sub', 'lesbian', 'rough'
 			gs 'stat'
 		
-			act 'Rise in a pose':
-				cla
-				*clr
+			act 'Get up':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r3.jpg"></center>'
-				'You get up on all fours on the bed. "But it''s too wet." Says your mistress, and wipes your saliva on your ass with the strap-on, "You need to be punished, not pleasured. Spread your ass."'
-				'Realizing that you will get it up the ass, you reach back with your hands and try to relax your ass. But you don''t succeed before the pain pierces your body when she forces the strap-on into your anus and not giving your ass the time to get used to it, starts fucking you at a crazy pace. You let go of your buttocks and seize the blankets with your hands and teeth. Tears pour from your eyes, you whine, but she still continues. Finally, a little tired she lowers the tempo and asks, "Well, does it hurt?"'
-				'"Yes ma''am, it hurts a lot." You gasp through your tears.'
-				'"Well, let''s see how this feels." She says, and begins pouring wine from her bottle onto the strap-on and your ass.'
-				'"Thank you, mistress." You say while she starts gaining momentum again. At first, it gets a little easier, but then stream of wine stops and it starts to dry on your skin. It hurts so much that you start screaming from the pain. "Why hasn''t anyone come in and stopped her." You think, because your screams have been so loud they could have been heard not only inside the apartment, but also in the hallway. But no one came, neither Tanya nor Nicholas. Finally she tires out, removes the strap-on out and walks out of the room without saying a word. You collapse on the bed and whine, your ass is on fire and you''re afraid to even move. After spending an hour so you fall asleep.'
-
+				'You get up on all fours on the bed. "You''re wet," she says and wipes your saliva on your ass with the strap-on, "You need to be punished, not pleasured. Spread your ass."'
+				'You reach back with your hands and try to relax your ass, but you don''t succeed before the pain pierces your body as she forces the strap-on into your anus, not giving your ass the time to get used to it before she starts fucking you at a crazy pace. You grab the blankets with your hands and teeth as tears pour from your eyes and you whine, but she still continues. Growing tired, she lowers the pace. "Well, does it hurt?" she asks.'
+				'"Yes mistress, it hurts a lot!" you gasp through your tears.'
+				'"Well, let''s see how this feels," she says and starts pouring wine from her bottle onto the strap-on and your ass.'
+				'"Thank you, mistress!" you say while she starts gaining momentum again. The wine starts to dry on your skin and hurts so much that you start screaming from the pain. After what feels like an eternity, she tires out, removes the strap-on and leaves the room without saying a word. You collapse on the bed and fall asleep.'
 				gs 'arousal', 'anal_strap', 5, 'sub', 'lesbian', 'rough'
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Sleep':gt 'bed2'
+				act 'Sleep': gt 'bed2'
 			end
 		end
 	end
@@ -274,25 +251,26 @@ if $ARGS[0] = 'rab':
 			houserab = 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r4.jpg"></center>'
-			'"No." You reply.'
-			'"You <<$pcs_nickname>> <<$pcs_lastname>>, will suck now or things will get very bad for you." She asserts.'
-			'"No." You answer again.'
-			'"All right, you asked for it." She screams and swings a fist, trying to hit you. You easily dodge the punch and kick her in the stomach.'
-			'"Bitch." She moans, doubling over. You have suffered enough, you jump out of bed and grabbing her head in your hands, knee her in the face.'
-			'She flies into the corner, but you don''t calm down. Remembering the taste of her dirty boots and sneakers you go up to her and start to push a sneaker into her mouth.'
-			'When you can''t shove it in any further, you throw away the sneaker, grab her hair, yank her off the floor and throw her on to the bed.'
-			'Now lying on the bed covering her face with her hands. You jump on the bed, straddling her face and push your pussy against her mouth. "Eat me, bitch." You yell, as she tries to push you away.'
-			'It''s no good, you have her head tight between your thighs. You continue yelling and she starts licking. You feel her tongue on your pussy and start moving your hips, grinding on her face and increasing the pace.'
-			'Soon you get excited. She does not resist and sticks her tongue out and tries to stick it in your pussy. You start enjoying her submissive nature and you get more excited thinking about your dominant actions.'
-			'You have even begun to think about something to do with her strap-on and enjoying this thought, you orgasm. You wipe your crotch in her face and finish. When you finally get off her, her whole face is covered in your juices.'
-			'She quietly gets out of bed, straightens her clothes and leaves the room, "Animal." She obviously won''t forget, from now on you should be careful, who knows what she will do.'
-
+			'"No!" you reply.'
+			'"You will suck now or things will get very bad for you!" she asserts.'
+			'"No!" you answer again.'
+			'"All right, you asked for it!" she screams and swings a fist, trying to hit you. You easily dodge the punch and kick her in the stomach.'
+			'"Bitch!" she moans while doubling over. You''ve suffered enough and jump out of bed, grabbing her head in your hands and kneeing her in the face.'
+			'She flies into the corner, but you don''t calm down. Remembering the taste of her dirty boots and sneakers, you storm up to her and start pushing a sneaker into her mouth.'
+			*nl
+			'When you can''t shove it in any further, you throw the sneaker aside, grab her hair and throw her onto the bed.'
+			'You jump on the bed, straddle her face and push your pussy against her mouth. "Eat me, bitch!" you yell as she tries to push you away.'
+			'You have her head held tight between your thighs, however, and continue yelling. You soon feel her tongue on your pussy and start moving your hips, grinding on her face and increasing the pace.'
+			'She doesn''t resist and tries to stick it in your pussy. You start enjoying her submissive nature and get more excited thinking about your dominant actions.'
+			'You''ve even thought about something to do with her strap-on and enjoying this thought when you orgasm. You wipe your crotch in her face and finish, leaving her whole face covered in your juices.'
+			*nl
+			'She quietly gets out of bed, straightens her clothes and leaves the room. "Animal." You should be careful; who knows what she will do to you in return.'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'cuni', 20, 'dom', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
 			
-			act 'Breathe':gt 'bed', 'start'
+			act 'Breathe': gt 'bed', '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>'
@@ -300,18 +278,17 @@ if $ARGS[0] = 'rab':
 end
 
 if $ARGS[0] = 'vor':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	if rex['owned'] = 1:
 		if dog_bravery = 0:
-			dog_bravery = rand(1, 100)
+			dog_bravery = rand(1,100)
 		end
 
 		if dog_bravery >= 50:
 			minut += 10
-			'You are lying in bed when suddenly there''s a ruckus in the hallway. You get up to check it out and as you arrive you see <<$rex[''name'']>> chase two masked men outside. You can hear loud swearing as they run down the stairs.'
-			'You call your dog''s name and he comes back from the stairway looking calm. His owner is safe, everything is right in the world.'
+			'You''re lying in bed when you suddenly hear a commotion out in the hallway. You get up to check it out and as you arrive, you see <<$rex[''name'']>> chase two masked men outside. You can hear loud swearing as they run down the stairs.'
+			'You call your dog''s name and he comes back from the stairway looking calm.'
 
 			act 'Hug him':
 				cla
@@ -319,23 +296,22 @@ if $ARGS[0] = 'vor':
 
 				act 'Check the lock':
 					cla
-					'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed.'
+					'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
 					act 'Lock the door': gt 'korr'
 				end
 			end
 
 			act 'Check the lock':
 				cla
-				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed.'
+				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
 				act 'Lock the door': gt 'korr'
 			end
 		else
-			'You are lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men.'
-			'Your dog <<$rex[''name'']>> is shivering in the corner.'
+			'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men. <<$rex[''name'']>> is shivering in the corner.'
 			act 'Scream': gt 'bed', 'vor2'
 		end
 	else
-		'You are lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door you see two masked men.'
+		'You''re lying in bed when you hear sounds from the hallway. You decide to get up and as you get to the door, you see two masked men.'
 		act 'Scream': gt 'bed', 'vor2'
 	end
 end
@@ -344,36 +320,29 @@ if $ARGS[0] = 'vor2':
 	menu_off = 1
 	minut += 60
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g0.jpg"></center>'
-
-	'You don''t even have time to open your mouth to scream, when a knife is at your throat. "Scream and I''ll cut you, bitch." Croaks one of them.'
-	'They tie your hands and one goes to search your apartment, while the second guards you. He sits down and studies you, then begins running his knife across your body.'
-	'"You scared?" He asks, and thinking that it is better to keep silent, you say nothing and look at the floor. "So you are scared." he grins.'
-	'Then he begins to feel you up, you try to pull away, but the knife is back at your throat, "Sit still bitch, or the knife might slip, fatally." he croaks, and continues feeling you up.'
-	'Finally, the other intruder returns. "Time we got out of here." He says.'
-	'"Unless we give this juicy little morsel a treat." He sits next to you'
+	'You don''t even have time to open your mouth to scream when a knife is at your throat. "Scream and I''ll cut you, bitch!" one of them croaks.'
+	'They tie your hands and one goes to search your apartment while the second guards you. He sits down and studies you, then starts running his knife across your body.'
+	'"You scared?" he asks. Thinking that it''s better to keep silent, you say nothing and look at the floor. "So you <i>are</i> scared..."'
+	'He starts feeling you up and you try to pull away, but the knife is back at your throat. "Sit still or the knife might slip. Fatally..." he croaks and continues feeling you up.'
+	'The other intruder finally returns. "Time we got out of here," he says. "Unless we give this juicy little morsel a treat," he adds as he sits next to you.'
 
 	if pcs_apprnc >= 120:
 		guy += 2
 		rape += 1
-		'"Hey, sweet cheeks, something tells me you like to fuck." Says the first.'
+		'"Hey, sweet cheeks. Something tells me you like to fuck," the first one says.'
 
 		act 'Plead':
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g1.jpg"></center>'
-			'You are struck with fear. "Well whore, kneel down and open your mouth, if we so much as feel a tooth, I''ll cut your throat from ear to ear" says the second one pulling his cock out.'
-			'You begin pleading with them not to touch you, but they just push you to your knees. He jabs his member against your lips. You reluctantly open your mouth and then his cock is in your mouth.'
-			'His hands clench your head and he begins to fuck your face. Suddenly there''s a second cock by your mouth, and they try to shove both into your mouth, then they look at each other and it seems they aren''t down with their cocks touching.'
-			'In fact it appears that only you are up for this type of treatment, so they go back to the first option and proceeded to rape your mouth one by one. All the time doing and saying everything they can think of to evoke disgust in you.'
-			'After the first couple of minutes you are surprised to notice that their hands are no longer on your head and you are actively bobbing your head and working your tongue.'
-			'"Get her on all fours." Commands one of them.'
-
+			'You''re struck with fear. "Kneel down and open your mouth, whore. If we so much as feel a tooth, I''ll cut your throat from ear to ear!" the second one says while pulling his cock out.'
+			'You start pleading with them, but they just push you to your knees and he jabs his dick against your lips. You reluctantly open your mouth and his cock slides into your mouth.'
+			'His hands clench your head and he starts fucking your face before they start taking turns with you.'
+			'"Get her on all fours," one of them eventually commands.'
 			gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
 			gs 'stat'
 			
-			act 'Up':
-				cla
-				*clr
+			act 'Get up':
+				*clr & cla
 				orgasm += 1
 				gs 'npcgeneratec', 0, 'Rapist', rand(18,40)
 				$boy[0] = $npclastgenerated
@@ -382,11 +351,8 @@ if $ARGS[0] = 'vor2':
 				$boy[1] = $npclastgenerated
 				$boydesc[1] = $npc_usedname[$npclastgenerated]
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sex/g2.jpg"></center>'
-				'You stand up and bend over, one of them stands behind you and stuffs his dick into your pussy. "Yes, it''s dripping wet, this bitch was just waiting for some cock." He says.'
-				'"Open your mouth." Growls the second guy inserting his dick into your mouth. They proceeded to rape you from both sides, you are overwhelmed with desire while being spit-roasted with your hands tied behind your back by two strangers.'
-				'You diligently fuck the one while sucking the others dick, when suddenly your eyes glaze, your body pleasantly shivers and you shake in orgasm. The one fucking your mouth pulls out. "What''s wrong with this bitch, is she epileptic?" He cries.'
-				'"You idiot, I told her to please us, and this bitch came." Says the second. They untie your hands and get off you. "Let''s see what she can do with her hands free." says one of them.'
-
+				'You stand up and bend over as one of them stands behind you and stuffs his dick into your pussy.'
+				'"Open your mouth!" the second guy growls and he inserts his dick into your mouth. They proceed to rape you from both sides before they untie your hands and get off you. "Let''s see what she can do with her hands free," one of them says.'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
 				gs 'arousal', 'vaginal', 15, 'rough', 'sub', 'group', 'bound'
@@ -397,16 +363,15 @@ if $ARGS[0] = 'vor2':
 			end
 		end
 	elseif pcs_apprnc < 120:
-		'"Do as I tell you." Replies the first. "And gag her." He adds. The second one doesn''t argue and takes some of your clothes and stuffs them in your mouth. "If you try to leave in the next half an hour you''re dead." Says the first intruder, and they leave.'
-		'You don''t wait half an hour before you start trying to break free, fortunately they really didn''t know how to tie a knot and soon you''re free.'
+		'"Gag her," one of them orders and the second one doesn''t argue as he takes some of your clothes and stuffs them in your mouth. "If you try to leave in the next half hour, you''re dead," he says and they leave.'
+		'You don''t wait half an hour before you start trying to break free. Fortunately, they really didn''t know how to tie a knot and you''re soon free.'
 
-		act 'Assess the damage':gt 'bed', 'vorend'
+		act 'Assess the damage': gt 'bed', 'vorend'
 	end
 end
 
 if $ARGS[0] = 'vorend':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	if remsitr = 0:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr.jpg"></center>'
 	if remsitr = 1:'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
@@ -429,7 +394,7 @@ if $ARGS[0] = 'vorend':
 	end
 
 	gs 'stat'
-	act 'Finish':gt 'sitr'
+	act 'Finish': gt 'sitr'
 end
 
 --- bed ---------------------------------

locations/bedr.qsrc

@@ -7,14 +7,10 @@ gs 'shortgs', 'setloc', 'bedr', $ARGS[0]
 $locclass = 'bedr'
 $location_type = 'private'
 gs 'themes', 'indoors'
-
 gs 'stat'
 
-
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
-
 '<center><b><font color="maroon">Bedroom</font></b></center>'
-
 if rembedr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr.jpg"></center>'
 	*nl
@@ -23,55 +19,55 @@ if rembedr = 0:
 	
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 	*nl
-	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
+	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. The windows are closed with faded, heavy curtains.'
 else
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/bedr2.jpg"></center>'
 	*nl
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
 	if budilnikOn = 0:
-		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
+		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 	else
 		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
-	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
+	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. Against the wall stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
 if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 *nl
-act 'The corridor':gt 'korr'
+act 'Go to the corridor': gt 'korr'
 
 if husbandrinkday = daystart:
-	if husbanstrapon = 1:'Your drunken husband sleeps on the bed, with a butt plug up his ass.'
-	if husbanstrapon = 2:'Your drunken husband sleeps on the bed, after you''ve put a dildo up his ass.'
-	if husbanstrapon = 3:'Your drunken husband sleeps on the bed, after you''ve fucked him with a strapon.'
+	if husbanstrapon = 1:'Your drunken husband sleeps on the bed with a butt plug up his ass.'
+	if husbanstrapon = 2:'Your drunken husband sleeps on the bed after you put a dildo up his ass.'
+	if husbanstrapon = 3:'Your drunken husband sleeps on the bed after you fucked him with a strap-on.'
 	gs 'music_actions', 'no_music'
 end
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
-	if hour > 22 or hour < 7:'<a href="exec:gt ''husb'', ''start''">Husband is sleeping on the bed.</a>'
+	if hour > 22 or hour < 7:'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sleeping on the bed.'
 	gs 'music_actions', 'no_music'
 end
 
 if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 	cla
-	'Your husband approaches you and asks, "Honey, my ass hurts, like a lot, do you know why?"'
+	'Your husband approaches you. "Honey, my ass hurts. Like a lot. Do you know why?"'
 
 	act 'Lie':
 		cla
 		menu_off = 1
 		husbanstrapon = 0
-		'"No dear, I do''nt know anything", you answer, trying to look as innocent as possible. He shruggs and walks away'
+		'"No dear, I don''t know anything about that," you answer, trying to look as innocent as possible before he shrugs and walks away.'
 
-		act 'Finish':gt 'bedr'
+		act 'Finish': gt 'bedr'
 	end
 
 	act 'Confess':
 		cla
 		menu_off = 1
 
-		if husbanstrapon = 1:'"Honey, you were so drunk last night, that I decided to teach you a lesson and put an anal plug up your ass. I''ll never do it again, forgive me please", you say.'
-		if husbanstrapon = 2:'"Dear, I wanted to make you happy, so I started to give you a blowjob, but you didn''t cum, so I inserted a finger into your asshole, but you still didn''t cum, then I took a small dildo and some lube and put in your ass, I''ve never seen you cum like that before. I even gave you a secong blowjob. Forgive me, but you seemed to enjoy it so much, that I could''t stop. I just wanted to make you happy.", you lie to him.'
-		if husbanstrapon = 3:'"Dear, I wanted to make you a happy, so I started to give you a blowjob, but you didn''t cum, so I inserted a finger into your asshole, but you still didn''t cum. When I put in a second finger you began to move your ass towards my fingers moaning heavily, I thought that you like it, so I put on a strapon. You enjoyed it so much that you finished over and over again, and I continued until I was tired. I then licked all the cum off your body and went to sleep. I just wanted to make you happy and you were enjoying it. Forgive me please", you lie him.'
+		if husbanstrapon = 1:'"Honey, you were so drunk last night that I decided to teach you a lesson and put a butt plug up your ass."'
+		if husbanstrapon = 2:'"I wanted to make you happy, so I started to give you a blowjob, but you didn''t cum, so I inserted a finger into your asshole. When you still didn''t cum, I took a small dildo and some lube and put in it your ass; I''ve never seen you cum like that before. I even gave you a secong blowjob. Forgive me, but you seemed to enjoy it so much that I could''t stop. I just wanted to make you happy," you lie to him.'
+		if husbanstrapon = 3:'"I wanted to make you happy, so I started to give you a blowjob, but you didn''t cum, so I inserted a finger into your asshole. When you still didn''t cum, I put in a second finger you began to move your ass towards my fingers, moaning heavily. I thought that you liked it, so I put on a strap-on. You enjoyed it so much that you finished over and over again, and I continued until I was tired. I then licked all the cum off your body and went to sleep. I just wanted to make you happy and you were enjoying it," you lie him.'
 
 		if harakHusb = 2:
 			husbizvradd = 0
@@ -81,18 +77,18 @@ if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 			divorced += 1
 			fingal += 1
 			minut += 120
-			'The next thing you feel is a powerful punch in the face. When you come back to your senses, you realize that your husband and his things are gone. He left a note, telling you he is going to file for divorce.'
+			'The next thing you feel is a powerful slap to the face. When you come back to your senses, your husband and his things are gone. He left a note telling you he''s going to file for divorce.'
 		elseif harakHusb = 1:
 			if husbanstrapon = 1:
-				'"Look, do not do it again!", he says and storms off angry.'
+				'"Don''t do that again!" he snarls and storms off.'
 			elseif husbanstrapon = 2:
 				husbizvradd += 1
-				'"Do not do it again, I''m still a man and I''m not supposed to get fucked in my ass!", he says and storms off angry.'
+				'"Don''t do that again! I''m a man and I''m not supposed to get fucked in the ass!" he snarls and storms off.'
 
 			elseif husbanstrapon = 3:
 				if pcs_intel > 40 or izvratH = 1:
 					husbharmin += 1
-					'"Are you serious, I''m not some kind of bitch, that wants to get fucked up the arse!" he yells at you. You start to cry and say that you only wanted to please him, he looks at you and says, sighting, "Don''t cry sweetie, I believe you, but do not do it again."'
+					'"Are you serious?! I''m not some kind of bitch that wants to get fucked up the ass!" he yells at you. You start to cry and say that you only wanted to please him and he looks at you and sighs. "Don''t cry, sweetie. I believe you, just don''t do it again."'
 				elseif pcs_intel <= 40:
 					husbizvradd = 0
 					husbharmin = 0
@@ -101,19 +97,19 @@ if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 					divorced += 1
 					fingal += 1
 					minut += 120
-			'The next thing you feel is a powerful punch in the face. When you come back to your senses, you realize that your husband and his things are gone. He left a note, telling you he is going to file for divorce.'
+					'The next thing you feel is a powerful slap to the face. When you come back to your senses, your husband and his things are gone. He left a note telling you he''s going to file for divorce.'
 				end
 			end
 		elseif harakHusb = 0:
 			if husbanstrapon = 1:
-				'"I''m sorry I will not get that drunk again, " he says and leaves the room.'
+				'"I''m sorry. I won''t get that drunk again," he says and leaves the room.'
 			elseif husbanstrapon = 2:
 				husbizvradd += 1
-				'"You''re so thoughtful, instead of scolding me, you still wanted to make me happy, thank you dear." he says and leaves the room.'
+				'"You''re so thoughtful. Instead of scolding me, you still wanted to make me happy. Thank you, dear," he says and leaves the room.'
 			elseif husbanstrapon = 3:
 				husbizvradd += 1
-				'"Did I really like it?" he asks. You nod.'
-				'"Well then, thank you dear, but the next time you should ask me first!" he says and leaves the room.'
+				'"Did I really like it?" he asks and you nod.'
+				'"Well then, thank you dear. Ask me next time though," he says and leaves the room.'
 			end
 		end
 
@@ -123,35 +119,31 @@ end
 
 if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	'<<$husName>> came home drunk and fell asleep on the bed.'
-	'<i>That pig!</i>, you think, but an idea springs to your mind, <i>Maybe I should teach him a lesson, so he won''t get drunk again</i>'
+	'<i>That pig</i>! you think when an idea springs to mind. <i>Maybe I should teach him a lesson so he won''t get drunk again</i>.'
 
 	if analplug = 1:
 		act 'Insert a butt plug in his ass':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			husbandrinkday = daystart
 			husbandrink = 11
 			husbanstrapon = 1
 			minut += 10
 			'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h0.jpg"></center>'
+			if analplugin = 1: 'You pull the plug out of you and shove it up his ass.'
+			if analplugin = 0: 'You take an anal plug and put it into his ass.'
 
-			if analplugin = 1:'You pull the plug out of your own anus and shove it up his ass.'
-			if analplugin = 0:'You go take an anal plug and put it into his ass.'
-
-			'<<$husName>> moved, but he doesn''t wake up'
+			'<<$husName>> moves, but he doesn''t wake up.'
 
 			if dildo > 0:
 				act 'Insert a dildo into his ass':
-					cla
-					*clr
+					*clr & cla
 					menu_off = 1
 					husbanstrapon = 2
 					gs 'boyStat', $HusID
 					gs 'cum_call', 'mouth_swallow', $boy, 1
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h1.jpg"></center>'
-					'You pull out the plug and replace with it with a dildo, <<$husName>> did not even budge. You slowly move the dildo in and out, trying not to wake him up. You notice his cock starts to get rock hard, and <<$husName>> starts to moan softly, but is still asleep. With the dildo in his ass, his dick starts to throb, it seems like he is going to cum. You take his dick in your mouth and you don''t need to suck on it for long. He starts to cum, you swallow it and completely clean his cock. You carefully put back on his underpants.'
-
+					'You pull out the plug and replace with it with a dildo. <<$husName>> doesn''t even budge as you slowly move the dildo in and out, trying not to wake him up. You notice his cock starts to get rock hard, and he starts to moan softly in his sleep. His dick starts to throb, like he''s going to cum. You take his dick in your mouth and don''t need to suck on it for long. You swallow his cum before carefully putting his underpants back on.'
 					gs 'arousal', 'bj', 20
 					gs 'arousal', 'anal_dildo_give', 20
 					minut -= 20
@@ -163,9 +155,8 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 			end
 
 			if strapon > 0:
-				act 'Use the strapon':
-					cla
-					*clr
+				act 'Use the strap-on':
+					*clr & cla
 					menu_off = 1
 					minut += 20
 					husbanstrapon = 3
@@ -173,8 +164,7 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					gs 'cum_call', 'mouth_swallow', $boy, 1
 					pcs_horny += 30
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h2.jpg"></center>'
-					'You put on the strapon and pull out the butt plug. You gently move the shaft of the strapon inside his ass, <<$husName>>  moves but doesn''t wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and <<$husName>> starts to moan softly, still not waking up. Hopeing that he won''t wake up, you increase your speed and push the entire length of the strapon into his has. You see his hard dick and you start to stroke it in addition to pounding him like a little bitch. Realizing he is not far from cumming, you pull out and finish him by giving him a blowjob. He cums inside it, you swallow it down and clean his cock. You carefully put back on his underpants.'
-
+					'You put on the strapon and pull out the butt plug. You gently move the shaft of the strap-on inside his ass and <<$husName>> moves, but doesn''t wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and he starts to moan softly in his sleep. Hoping that he won''t wake up, you increase your speed and push the entire length of the strap-on into his ass as you start to stroke his dick. Realizing he''s not far from cumming, you pull out and finish him by giving him a blowjob. He cums in your mouth and you swallow before carefully putting his underpants back on.'
 					gs 'arousal', 'bj', 20
 					gs 'arousal', 'anal_strap_give', 20
 					minut -= 20
@@ -191,30 +181,27 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 end
 
 if sick >= 1:
-	act 'Go to sleep (You''re sick)':
-		cla
-		*clr
+	act 'Go to sleep (Sick)':
+		*clr & cla
 		menu_off = 1
 		minut += 240
 		pcs_sleep += 40
 		sick -= 1
-
 		if sick < 0:sick = 0
-
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick<<rand(11, 17)>>.jpg"></center>'
-		'You are lying in bed, coughing, sneezing and blowing your nose'
+		'You''re lying in bed coughing, sneezing and blowing your nose.'
 
-		act 'Measure temperature':gt 'bedr'
+		act 'Check your temperature': gt 'bedr'
 	end
 end
 
 dynamic $palelady
 
-if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
+if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if pornMagazine > 0:
-	'Under your mattress you hide a porn magazine.'
+	'You hide a porn magazine under your mattress.'
 	gs 'events', 'read_porn'
 end
 gs 'subkid'
@@ -223,5 +210,6 @@ act 'Relax on your bed': gt 'bed', 'start'
 act 'Open wardrobe': gt 'wardrobe', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
 gs 'music_actions', 'music_icon'
+
 --- bedr ---------------------------------
 

locations/bedr2x.qsrc

@@ -11,7 +11,6 @@ $menu_arg = ''
 menu_off = 0
 $locclass = 'bedr'
 $location_type = 'private'
-
 minut += 1
 elektro += 1
 gs 'stat'
@@ -23,7 +22,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
+'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
@@ -32,35 +31,35 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 *nl
 if husbandrinkday = daystart:
-	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used an anal plug on him.'
-	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'
-	if husbanstrapon = 3:'Your husband is still passed out drunk, after you fucked him in the ass with a strap-on.'
+	if husbanstrapon = 1:'Your husband is still passed out drunk after you used an anal plug on him.'
+	if husbanstrapon = 2:'Your husband is still passed out drunk after you stuck a dildo in his ass.'
+	if husbanstrapon = 3:'Your husband is still passed out drunk after you fucked him in the ass with a strap-on.'
 	gs 'music_actions', 'no_music'
 end
-act 'In the corridor':gt'korr2x'
+act 'Go to the corridor': gt 'korr2x'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:
-		'<a href="exec: gt''husb'',''start'' ">On the bed your husband is sleeping.</a>'
+		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sleeping on the bed.'
 		gs 'music_actions', 'no_music'
 	end
 end
 if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 	cla
-	'Your husband approaches you and asks, "Dear my ass hurts, did something happen yesterday?"'
-	act 'Lied':
+	'Your husband approaches you. "Honey, my ass hurts. Did something happen yesterday?"'
+	act 'Lie':
 		cla
 		menu_off = 1
 		husbanstrapon = 0
-		'"No dear, not that I know of, though you were in the bathroom a lot." You say with an innocent look on your face. Your husband shrugged his shoulders and walked away'
-		act 'Finish':gt'bedr2x'
+		'"Not that I know of, though you were in the bathroom a lot," you say with an innocent look on your face before he shrugs his shoulders and walks away.'
+		act 'Finish': gt 'bedr2x'
 	end
 	act 'Confess':
 		cla
 		menu_off = 1
-		if husbanstrapon = 1:'"Dear yesterday you got so drunk, I decided to teach a lesson to you and you put a plug in your ass. But I''ll never do it again, please forgive me." you say.'
-		if husbanstrapon = 2:'"Dear, I wanted to give you a pleasant surprise and started to give you a blowjob, but you wouldn''t cum no matter how much I tried. So I put a finger in your ass, but again you failed to cum. Then I put the dildo in your ass and you shoot your load, I even gave you another blowjob, forgive me, but you were so good that I could not stop, I just wanted to get you off." Is what you tell him.'
-		if husbanstrapon = 3:'"Dear, I wanted to give you a pleasant surprise and started to give you a blowjob, but you wouldn''t cum no matter how much I tried. So I put a finger in your ass, but again you failed to cum. Then I put in a second finger in your ass, but you started moving your ass up and down, fucking my fingers as you moaned in pleasure, muttering yes more. Since you seemed to be liking it so much and asked for more. I put on my strap-on and I fucked you with it, while I was jerking you off. You came several times, shooting several thick heavy loads all over. I kept doing it until I got to tired to fuck you anymore, then I stopped and licked all your sperm up and went to sleep next to you. I just wanted you to be happy, even if you don''t remember. Please forgive me?" Is what you tell him.'
+		if husbanstrapon = 1:'"You got so drunk yesterday that I decided to teach you a lesson and put a plug in your ass."'
+		if husbanstrapon = 2:'"I wanted to give you a pleasant surprise and started to give you a blowjob, but you wouldn''t cum no matter how much I tried, so I put a finger in your ass, but again you failed to cum. That''s when I put the dildo in your ass and you shot your load. Forgive me, but I just wanted to get you off."'
+		if husbanstrapon = 3:'"I wanted to give you a pleasant surprise and started to give you a blowjob, but you wouldn''t cum no matter how much I tried, so I put a finger in your ass, but again you failed to cum. That''s when I put in a second finger and you started moving your ass up and down, fucking my fingers as you moaned in pleasure. Since you seemed to be liking it so much and asked for more, I put on my strap-on and fucked you with it while I was jerking you off. I just wanted you to be happy, even if you don''t remember. Please forgive me!"'
 		if harakHusb = 2:
 			husbizvradd = 0
 			husbharmin = 0
@@ -70,18 +69,17 @@ if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 			fingal += 1
 			minut += 120
 
-			'The next thing you feel is a powerful slap to the face. Without saying another word to you, he packed his things quickly and left. Later that same day he filed for a divorce.'
+			'The next thing you feel is a powerful slap to the face. When you come back to your senses, your husband and his things are gone. He left a note telling you he''s going to file for divorce.'
 		elseif harakHusb = 1:
 			if husbanstrapon = 1:
-				'"Look, just don''t do that anymore." he said and left.'
+				'"Just don''t do that anymore," is all he says before leaving the room.'
 			elseif husbanstrapon = 2:
 				husbizvradd += 1
-				'"Well, my balls feel empty, but don''t ever do that again, I''m still a man and I don''t get fucked in the ass, I do the fucking." he said and left.'
+				'"Don''t ever do that again. I''m a man and <i>I</i> do the fucking!" he says before leaving the room.'
 			elseif husbanstrapon = 3:
 				if pcs_intel > 40 or izvratH = 1:
 					husbharmin += 1
-
-					'"Are you really trying to tell me, that I asked you to fuck me with a strap-on bitch?" he bellowed, when you started crying, with tears running down your face and began to lament that only wanted to please him, he looked at you and said, exhaled. "Fine, fine, I believe you. I believe you wanted to pleasure me and make me happy, but never do that again."'
+					'"Are you really trying to tell me that I asked you to fuck me with a strap-on, bitch?" he bellows. When you start crying and lamenting that you only wanted to please him, he looks at you and exhales. "Fine, fine, I believe you. I believe you wanted to pleasure me and make me happy, but never do that again."'
 				elseif pcs_intel <= 40:
 					husbizvradd = 0
 					husbharmin = 0
@@ -91,116 +89,108 @@ if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
 					fingal += 1
 					minut += 120
 
-					'The next thing you feel is a powerful slap to the face. Without saying another word to you, he packed his things quickly and left. Later that same day he filed for a divorce.'
+					'The next thing you feel is a powerful slap to the face. When you come back to your senses, your husband and his things are gone. He left a note telling you he''s going to file for divorce.'
 				end
 			end
 		elseif harakHusb = 0:
 			if husbanstrapon = 1:
-				'"I''m sorry I will not get so drunk again." he said and left.'
+				'"I''m sorry. I won''t get that drunk again," he says before leaving the room.'
 			elseif husbanstrapon = 2:
 				husbizvradd += 1
-				'"You''re such a caring woman, instead of scolding me for being drunk. You suck me off instead, thank you dear." he said and left.'
+				'"You''re such a caring woman. Instead of scolding me for being drunk, you suck me off. Thank you, dear," he says before leaving the room.'
 			elseif husbanstrapon = 3:
 				husbizvradd += 1
-				'"I really liked it?" he asked, you nodded affirmatively, "Well then, thank you dear, but next time ask for my consent." he said and left'
+				'"I really liked it?" he asks and you nod. "Well then, thank you dear, but ask for my consent next time," he says before leaving the room.'
 			end
 		end
 
-		act 'Finish':husbanstrapon = 0 & gt'bedr2x'
+		act 'Finish':husbanstrapon = 0 & gt 'bedr2x'
 	end
 end
 
 if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 	'<<$husName>> came home very drunk and collapsed on the bed. He fell asleep in his clothes.'
-	'"That pig!" You swore, and then started thinking of ways to teach him a lesson.'
+	'<i>That pig</i>! you think when an idea springs to mind. <i>Maybe I should teach him a lesson so he won''t get drunk again</i>.'
 
 	if analplug = 1:
 		act 'Insert an anal plug':
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			husbandrinkday = daystart
 			husbandrink = 11
 			husbanstrapon = 1
 			minut += 10
-
 			'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h0.jpg"></center>'
-			if analplugin = 1:'You get out your butt plug and pull down his pants. You put just a dab of lube on the tip of the plug, then gently insert it in his ass.'
-			if analplugin = 0:'You go get a small skinny candle, you come back and pull down his pants and slip the candle in his ass.'
-			'<<$husName>> moved, but did not wake up.'
+			if analplugin = 1: 'You get your butt plug out and pull down his pants. You put just a dab of lube on the tip of the plug, then gently insert it into his ass.'
+			if analplugin = 0: 'You take an anal plug and put it into his ass.'
+			'<<$husName>> moves, but he doesn''t wake up.'
 
 			if dildo > 0:
 				act 'Insert dildo':
-					cla
-					*clr
+					*clr & cla
 					menu_off = 1
 					husbanstrapon = 2
 					gs 'boyStat', $HusID
 					gs 'cum_call', 'mouth_swallow', $boy
-
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h1.jpg"></center>'
 					'You pull out the plug and stick the dildo up his ass instead, <<$husName>> did not move. You began to slowly move the dildo trying not to wake him. After a bit his dick begins to get hard in front of your face, and <<$husName>> moaned softly, but didn''t wake up. You start to really work the dildo in his ass, stroking it deep in his ass, before too long his cock started to throb. You wrap your lips around his cock, you barely even started to suck his dick when suddenly your mouth is filled with a jet of sperm, you swallow it all and carefully cleaned his penis, then you pulled his pants back up.'
-
 					gs 'arousal', 'bj', 20
 					gs 'arousal', 'anal_dildo_give', 20
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Finish':gt'bedr2x'
+					act 'Finish': gt 'bedr2x'
 				end
 			end
 
 			if strapon > 0:
 				act 'Wear strap-on':
-					cla
-					*clr
+					*clr & cla
 					menu_off = 1
+					minut += 20
 					husbanstrapon = 3
-					gs 'boyStat', $husID
-					gs 'cum_call', 'mouth_swallow', $boy
-
+					gs 'boyStat', $HusID
+					gs 'cum_call', 'mouth_swallow', $boy, 1
+					pcs_horny += 30
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h2.jpg"></center>'
-					'You get out your strap-on and wear it. Once it''s firmly in place, you lube it up before you position yourself so the strap-on, is against his anus, <<$husName>> stirred, but did not wake up. You slowly push the strap-on into his ass slowly as to not wake him up. He moans as you do, you slowly slip it balls deep in him and then proceed to fuck him, his cock gets hard as you do. Realizing that in this state, he will not wake up, you start to really fuck him hard, dring it the entire length of the strap-on balls deep in his ass. As his cock started quivering you took a hold of it and began jerking him off as you fucked him with your strap-on. You are really starting to get into it when he moans loudly and starts shooting cum all over his own stomach. Once he stops spurting sperm you stop fucking him and pull the strap-on out of his ass, you lick the cum up off his stomach. Once finished you clean everything up and pull his pants back up.'
-
+					'You put on the strapon and pull out the butt plug. You gently move the shaft of the strap-on inside his ass and <<$husName>> moves, but doesn''t wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and he starts to moan softly in his sleep. Hoping that he won''t wake up, you increase your speed and push the entire length of the strap-on into his ass as you start to stroke his dick. Realizing he''s not far from cumming, you pull out and finish him by giving him a blowjob. He cums in your mouth and you swallow before carefully putting his underpants back on.'
 					gs 'arousal', 'bj', 20
-					gs 'arousal', 'anal_dildo_give', 20
+					gs 'arousal', 'anal_strap_give', 20
 					minut -= 20
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Finish':gt'bedr2x'
+					act 'Finish': gt 'bedr2x'
 				end
 			end
 
-			act 'Finish':gt'bedr2x'
+			act 'Finish': gt 'bedr2x'
 		end
 	end
 end
 
 if sick >= 1:
-	act 'Go to bed rest (disease)':
-		cla
-		*clr
+	act 'Go to bed rest (Sick)':
+		*clr & cla
 		menu_off = 1
 		minut += 240
 		sick = sick - 1
 		if sick < 0:sick = 0
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick<<rand(11,17)>>.jpg"></center>'
+		'You lie in bed, coughing, sneezing and blowing your nose.'
 
-		'You lie in bed, coughing, sneezing and blowing your nose'
-
-		act 'Pomeroy temperature':gt'bedr2x'
+		act 'Check your temperature': gt 'bedr2x'
 	end
 end
 
 dynamic $palelady
 
-if pcs_horny >= 50: act 'Masturbate': gt'selfplay', 'start'
+if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
 
 if pornMagazine > 0:
-	'Under the mattress you have hidden a porn magazine.'
+	'You have hidden a porn magazine under your mattress.'
 	gs 'events', 'read_porn'
 end
 

locations/bedrPar.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
 			gt 'mother', 'plug_find'
 		else
-			'You walk into your bedroom and find your <<$npc_nickname[''A29'']>> sweeping and dusting the room, folding clothes and putting them away and making the beds.'
+			'You walk into your bedroom and find your mother sweeping and dusting the room, folding clothes and putting them away and making the beds.'
 			act 'Access wardrobe':
 				$loc = 'korrPar'
 				$loc_arg = ''
@@ -37,8 +37,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	elseif ParrotQW['Level'] = 2 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
-		'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl.'
-		'You hope this will work and keep him from spilling you and your sister''s bedroom secrets.'
+		'As soon as you enter the room, you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl. You hope this will work and keep him from spilling you and your sister''s bedroom secrets.'
 		ParrotQW['Level'] = 3
 		ParrotQW['Day'] = 3
 		
@@ -46,7 +45,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
-		'When you enter the room, you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
+		'When you enter the room, you notice <<$ParrotQW[''Name'']>>''s cage is open and he''s gone.'
 		'Anya must have released him since you weren''t able to find a solution in time.'
 		ParrotQW['Owned2'] = 0
 		ParrotQW['Level'] = 0
@@ -73,7 +72,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 		if npc_rel['A33']  <= 50:
 			'"No he isn''t cute, and I suggest you get it out of here. I''m not sharing my room with a bird!"'
-			'You are somewhat upset, but you understand. You should have asked her before buying it.'
+			'You''re somewhat upset, but you understand. You should have asked her before buying it.'
 			'You go to the window, open it and release the bird.'
 			ParrotQW['Owned2'] = 0
 		end
@@ -176,7 +175,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					sisterdialog = 3
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
 				elseif locat['Anya'] = 15:
-					if anyaQW['bathroom_dildos'] > 0:gt'sister_chat','bathroom_dildo_talk1'
+					if anyaQW['bathroom_dildos'] > 0: gt 'sister_chat','bathroom_dildo_talk1'
 					'<a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
 				elseif locat['Anya'] = 26:
 					if sisboypartyQW = 1: sisboypartyQW = 2
@@ -193,9 +192,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if $home['current'] = 'parents_home':
 			act 'Relax on your bed': gt 'bed', 'start'
-
 			act 'Open wardrobe': gt 'wardrobe', 'start'
-			
 			gs 'prostitution_functions', 'prostitute_outfit_at_home'
 			
 			if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
@@ -220,9 +217,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
-
+			
 			gs 'wardrobe', 'default_sport_options'
-
+			
 			gs 'exercise', 'start'
 
 			if sewing_kit = 1:
@@ -243,17 +240,17 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 								tkan -= 1
 								newgobelen = 1
 								minut += 15
-								gs'stat'
+								gs 'stat'
 								'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
 
-								act'Set the tapestry aside':gt 'bedrPar', 'start'
+								act 'Set the tapestry aside': gt 'bedrPar', 'start'
 							end
 						end
 					end
 				end	
 				if newgobelen>=1:
 					'Your tapestry is <<newgobelen/10>> percent finished.'
-					act'Work on the tapestry':
+					act 'Work on the tapestry':
 						*clr & cla
 						menu_off = 1
 						minut+=60
@@ -261,14 +258,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 						gobramax = (pcs_sewng - 70) * 6
 						gobramin = (pcs_sewng - 70) * 2
 						newgobelen += rand(gobramin,gobramax)
-						gs'stat'
+						gs 'stat'
 						if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
 							if newgobelen >= 1000:
 							newgobelen = 0
 							gobelen += 1
 							'Your work on the tapestry is done.'
 						end
-						act'Set the tapestry aside':gt 'bedrPar', 'start'
+						act 'Set the tapestry aside': gt 'bedrPar', 'start'
 					end
 				end
 				if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
@@ -281,8 +278,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 				if sisboytrio = 0: access['noporn'] = 1
 				access['nocamshow'] = 1
-				$access['noporn'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
-				$access['nocamshow'] ='You can''t do any webcam activities with your sister in the room!'
+				$access['noporn'] = 'You shouldn''t watch porn with your sister in the room. She would notice for sure!'
+				$access['nocamshow'] = 'You can''t do any webcam activities with your sister in the room!'
 			else
 				gs 'music_actions', 'clear_restrictions'
 			end
@@ -316,8 +313,7 @@ if $ARGS[0] = 'intro':
 	music_loop = 0
 	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-	*nl
-	'All of a sudden, you hear a familiar voice yell out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
+	'You sudenly hear a familiar voice yelling out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
 	wait 1000
 	$temp_nickname = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
 	if $temp_nickname ! '':$npc_nickname['A29'] = '<<$temp_nickname>>'
@@ -328,17 +324,17 @@ if $ARGS[0] = 'intro':
 		gs 'stat'
 		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		'You tiredly open your eyes and see your <<$npc_nickname[''A29'']>> standing over you. "Fifteen more minutes..." you mumble.'
-		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh. "No, up now!" she says as she yanks the covers off.'
+		'You tiredly open your eyes and see your mother standing over you. "Fifteen more minutes..." you mumble.'
+		'Your mother lets out a loud sigh. "No, up now!" she says as she yanks the covers off.'
 		'"<<$npc_nickname[''A29'']>>!" you exclaim as you feel a slightly cold breeze hit your body.'
-		'"No excuses <<$pcs_nickname>>. The summer holidays will be over before you know it and you mustn''t get used to sleeping in, otherwise you won''t be able to get up early when school starts again. From now on, set your alarm to wake up at a reasonable time." your <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		'"No excuses, <<$pcs_nickname>>! The summer holidays will be over before you know it and you mustn''t get used to sleeping in, otherwise you won''t be able to get up early when school starts again. From now on, set your alarm to wake up at a reasonable time." your <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
 		act 'Get up':
 			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, repeating what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			'As soon as you get off your now coverless bed, your mother is quick to resume her nagging, repeating what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
 			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
 			act 'Continue':
 				cla & *clr
@@ -347,7 +343,7 @@ if $ARGS[0] = 'intro':
 				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
 				'You let out an exasperated sigh. "Yeah yeah I know, you told me that already. So how early are we talking?"'
-				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
+				'Your mother shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
 				act 'Continue':
 					cla & *clr
 					minut += 2
@@ -355,8 +351,8 @@ if $ARGS[0] = 'intro':
 					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
-					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either." she warns you before making her way towards the kitchen.'
-					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month." she adds quickly.'
+					'Your mother shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns before making her way towards the kitchen.'
+					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month!" she adds quickly.'
 					act 'But why do I--':
 						$loc_arg = 'start'
 						cla & *clr
@@ -364,7 +360,7 @@ if $ARGS[0] = 'intro':
 						gs 'stat'
 						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" your <<$npc_nickname[''A29'']>> says before she storms out of the room without giving you a chance to respond.'
+						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" she says before she storms out of the room without giving you a chance to respond.'
 						act 'I understand...':gt 'budilnik', 'start'
 					end
 				end

locations/bedrPar2.qsrc

@@ -20,9 +20,9 @@ if $ARGS[0] = '':
 	'The room in which your parents sleep. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
 	if locat['Fam_inGad'] = 0:
 		if locat['Mother'] = 1 and locat['Stepdad'] = 1:
-			'Your <<$npc_nickname[''A29'']>> and stepfather are sleeping on the bed.'
+			'Your mother and stepfather are sleeping on the bed.'
 		elseif locat['Mother'] = 1:
-			'Your <<$npc_nickname[''A29'']>> is sleeping on the bed.'
+			'Your mother is sleeping on the bed.'
 		elseif locat['Stepdad'] = 1:
 			'Your stepfather is sleeping on the bed.'
 		end
@@ -96,20 +96,20 @@ if $ARGS[0] = 'wardrobe_search':
 	end
 	if rand(1,100) > 75:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobesearch'+rand(1,4)+'.jpg"></center>'
-		$failwords[0]='You cannot find anything interesting.'
-		$failwords[1]='You find some clothes and underwear.'
-		$failwords[2]='You dig through your mother''s closet, but find nothing interesting except underwear.'
+		$failwords[0]= 'You don''t find anything interesting.'
+		$failwords[1]= 'You find some clothes and underwear.'
+		$failwords[2]= 'You dig through your mother''s closet, but find nothing interesting except underwear.'
 		*pl $failwords[rand(0,2)]
 		killvar '$failwords'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobetoy.jpg"></center>'
-		$findmomtoy[0]='Digging through the closet you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">Dildo</a>'
-		$findmomtoy[1]='Rummaging through your mother''s lingerie you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">Dildo</a>'
-		$findmomtoy[2]='You find your mother''s <a href="exec: gt ''bedrPar2'',''momtoy_play''">toy</a>'
+		$findmomtoy[0]= 'Digging through the closet, you find a <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
+		$findmomtoy[1]= 'Rummaging through your mother''s lingerie, you find a small <a href="exec: gt ''bedrPar2'',''momtoy_play''">dildo</a>.'
+		$findmomtoy[2]= 'You find your mother''s <a href="exec: gt ''bedrPar2'',''momtoy_play''">toy</a>.'
 		*pl $findmomtoy[rand(0,2)]
 		killvar '$findmomtoy'
 	end
-	act 'Close the Cabinet': gt $loc, $loc_arg
+	act 'Close the cabinet': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'momtoy_play':
@@ -132,36 +132,36 @@ if $ARGS[0] = 'peek':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'
-	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body.'
+	'You crack the door open just a little and you see your mother and Vladimir near their bed. "Stop! The kids are here," your mother says as Vlad starts running his hands over her body.'
 	'He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
-	act 'Leave':gt 'korrPar'
+	act 'Leave': gt 'korrPar'
 
 	act 'Keep peeking':
 		cla & *clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
-		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparently knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
+		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she''s mostly naked, he pushes her down on the bed so she''s sitting on it in front of him, her head about crotch height to him. Knowing what he wants, she opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck, you''re the best cocksucker ever, Natasha."'
 		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 
-		act 'Leave':gt 'korrPar'
+		act 'Leave': gt 'korrPar'
 
 		act 'Keep peeking':
 			cla & *clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
-			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while continuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style.'
-			'Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
+			'After spending several minutes sucking Vlad''s cock, she helps him strip while continuing to suck his dick. Once he''s naked, he lies down on the bed and she straddles him and quickly starts riding his dick reverse cowgirl style.'
+			'Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big!"'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
-			act 'Leave':gt 'korrPar'
+			act 'Leave': gt 'korrPar'
 
 			act 'Keep peeking':
 				cla & *clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad4.jpg"></center>'
-				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against her anus, then he pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your <<$npc_nickname[''A29'']>> has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
+				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against her anus, then pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your mother has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave':gt 'korrPar'
@@ -170,11 +170,12 @@ if $ARGS[0] = 'peek':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
-					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha."'
-					'She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
+					'They keep going for several more minutes until Vlad starts to pant and buries his dick balls deep in your mother''s ass and lets out a loud moan as he twitches. After a few seconds, he pulls out of her and rolls off the bed as she gets on her back and spreads her ass, giving both you and Vlad a good view of her asshole as his cum starts leaking out of it.'
+					'"You''re such a nasty bitch, Natasha!" he laughs.'
+					'She smiles at him. "That''s why you love me," she replies. They start getting cleaned up and you decide it''s time to go before you get caught.'
 					gs 'arousal', 'voyeur_sex', 3
 					gs 'stat'
-					act 'Leave':gt 'korrPar'
+					act 'Leave': gt 'korrPar'
 				end
 			end
 		end

locations/bras.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'view_bra_list':
 		metka_bras = 2
 	end
 
-	gs 'bras', 'filter_header', 'store'
+	gs 'bras', 'filter_header'
 
 	'<center><table border=1><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''wardrobe''">Draw</a></TH><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''unwanted''">Unwanted</a></TH></table></center>'
 
@@ -310,9 +310,9 @@ if $ARGS[0] = 'view_bra_item':
 						if dyneval('RESULT = <<$ARGS[2]>>_panties[<<underwear[''pair'']>>]') = 1:
 							'You own these panties and can wear this set.'
 							act 'Wear set':
-								if CloBra = 1:
+								if PCloBra = 1:
 									msg'You cannot wear a bra with this top'
-								elseif CloPanties = 1:
+								elseif PCloPanties = 1:
 									msg'You cannot wear a panties with this outfit'
 								else
 									if hypnoBra > 0 and hypnoPanty > 0:
@@ -602,27 +602,9 @@ if $ARGS[0] = 'filter_header':
 	end
 
 
-	$Headerstring[2] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Include</TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH><TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Sort by</TH><TH></TH>'
+	$Headerstring[2] = '<TH>Include</TH><TH>Sort by</TH><TH></TH>'
 
-	$Headerstring[3] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	$Headerstring[3] += '<TH>Only show</TH>'
+	$Headerstring[3] = '<TH>Only show</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
 	'<TR><border=1><<$Headerstring>>'
@@ -654,16 +636,8 @@ if $ARGS[0] = 'bra_filter':
 end
 
 if $ARGS[0] = 'shop_filter_header':
-!! exclude filters
-	$Headerstring = '<TD>'
-	if clothingfilter['sport'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	end
-
 !! sort by filters
-	$Headerstring += '<TD>'
+	$Headerstring = '<TD>'
 	if clothingfilter['number'] = 0:
 		clothingfilter['quality'] = 1
 		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
@@ -678,40 +652,14 @@ if $ARGS[0] = 'shop_filter_header':
 		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
 	end
 
-!! Show only filers
-	$Headerstring[1] = '<TD>'
-	if clothingfilter['sport_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	end
-
-
-	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH><TH>Include</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
-
-	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH><TH>Only show</TH>'
+	$Headerstring[2] = '<TH>Sort by</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
-	'<TR><border=1><<$Headerstring>>'
-
-	'<TR><border=0><<$Headerstring[3]>>'
-	'<TR><border=1><<$Headerstring[1]>></table></center>'
+	'<TR><border=1><<$Headerstring>></table></center>'
 end
 
 if $ARGS[0] = 'shop_filter':
-!!Exclude filters
-	clothingfilter['inc'] = 1
-	!!filters, if inc set to 0 they will not display
-	if clothingfilter['sport'] = 1 and BraFun = 2:
-		clothingfilter['inc'] = 0
-	end
 
-!!only filters
-	clothingfilter['only'] = 0
-	!!filters, if only set to 1 they will only display those set
-	if clothingfilter['sport_only'] = 1 and BraFun = 2:
-		clothingfilter['only'] += 1
-	end
 end
 
 

locations/budgetclothes.qsrc

@@ -452,6 +452,11 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
+
 
 	act 'Return':
 		cla
@@ -459,11 +464,28 @@ if $ARGS[0] = 'shoes':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = 1
-	:loopgm_shoes
-		if gm_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 30:jump 'loopgm_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopgm_shoes
+			if gm_shoe[i] = 0:
+				gs 'shoe_attributes', 'gm', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/items/gm/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 30:jump 'loopgm_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gm',i, 700
@@ -524,6 +546,10 @@ if $ARGS[0] = 'panties':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M panties</font></b></center>'
+
+
+	gs 'panties', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -531,15 +557,29 @@ if $ARGS[0] = 'panties':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = 1
-	:looppanties
-		if gm_panties[i] = 0:*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
-		i += 1
-		if i = 7: i = 8
-		if i = 9: i = 10
-		if i = 21: i = 22
-		if i = 37: i = 38
-	if i <= 37:jump 'looppanties'
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
+
+		i = 1
+		:looppanties
+			if gm_panties[i] = 0:
+				gs 'underwear_attributes', 'gm_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: gt ''panties'', ''view_panty_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/panties/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+			i += 1
+			if i = 7: i = 8
+			if i = 9: i = 10
+			if i = 21: i = 22
+			if i = 37: i = 38
+		if i <= 37:jump 'looppanties'
+
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bras':
@@ -550,6 +590,10 @@ if $ARGS[0] = 'bras':
 	$loc = 'budgetclothes'
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M bras</font></b></center>'
+	*nl
+
+	gs 'bras', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -557,14 +601,28 @@ if $ARGS[0] = 'bras':
 		gt 'budgetclothes', 'start'
 	end
 
-	i = 1
-	:loopbras
-		if gm_bras[i] = 0:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
+
+		i = 1
+
+		:loopgm_bras
+			if gm_bras[i] = 0:
+				gs 'underwear_attributes', 'gm_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''shop'', ''gm'', <<i>>, 300"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
 		i += 1
 		if i = 11: i = 13
 		if i = 16: i = 17
 		if i = 18: i = 19
-	if i <= 19:jump 'loopbras'
+		if i <= 19:jump 'loopgm_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 

locations/city_apt_building.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'housemates':
 	*clr & cla
 	minut +=1
 	gs 'stat'
-	 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/housemates.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/housemates.jpg"></center>'
 	'Floor 1 - You don''t know anyone on this floor.'
 	'Floor 2 - You don''t know anyone on this floor.'
 	'Floor 3 - You don''t know anyone on this floor.'
@@ -36,14 +36,14 @@ if $ARGS[0] = 'floor_1':
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/podezd.mp3',30
 	gs 'stat'
-	'<center><b><font color = maroon>Ground floor of the apartment building</font></b></center>'
+	'<center>First Floor</center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/stairs1.jpg"></center>'
-	'<center>When you enter the building there is a short staircase down to the basement maintenance area and a short staircase up to the first floor, where there is a <a href="exec: gt ''city_apt_building'', ''housemates''">list</a> of the people who live here on the wall. There is a series of mailboxes for each apartment, two halls going off to each wing of the building, and more stairs going up. The area is fairly clean and well maintained.</center>'
+	'There is a short staircase down to the basement maintenance area and a short staircase up to the first floor, where there is a <a href="exec: gt ''city_apt_building'', ''housemates''">list</a> of the people who live here on the wall. There is a series of mailboxes for each apartment, two halls going off to each wing of the building, and more stairs going up. The area is fairly clean and well maintained.'
 	if rand(0,5) = 0 and ((minut + 60*(hour+daystart*24) - floor1_event_time) > 60) or ((daystart+1)*1440 < floor1_event_time):
 		floor1_event_time = minut + 60*(hour+daystart*24)
 		gt 'city_apt_building', 'floor1_events', '<<$ARGS[1]>>'
 	else
-		'<br>The stairwell is empty.'
+		'The stairwell is empty.'
 	end
 	act 'Leave the building': minut += 1 & gt 'city_residential', 'start'
 	act 'Go up to the second floor': minut +=1 & gt 'city_apt_building','floor_2'
@@ -55,14 +55,14 @@ if $ARGS[0] = 'floor_2':
 	$menu_arg = 'floor_2'
 	menu_off = 0
 	gs 'stat'
-	'<center>2nd floor of the apartment building</center>'
+	'<center>Second Floor</center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/stairs2.jpg"></center>'
-	'<center>The second floor stairwell is decently clean and fairly well maintained. There is the occasional flickering light or even a light out, which are often not fixed for weeks.</center>'
+	'The second floor stairwell is decently clean and fairly well maintained except for the occasional flickering or busted light, which is often not fixed for weeks.'
 	if rand(0,3) = 0 and ((minut + 60*(hour+daystart*24) - floor2_event_time) > 60) or ((daystart+1)*1440 < floor2_event_time):
 		floor2_event_time = minut + 60*(hour+daystart*24)
 		gt 'city_apt_building', 'floor2_events'
 	else
-		'<br>The stairwell is empty.'
+		'The stairwell is empty.'
 	end
 	act 'Go down to the first floor': minut +=1 & gt 'city_apt_building','floor_1', 'from_second_floor'
 	act 'Go up to the third floor': minut +=1 & gt 'city_apt_building','floor_3', 'from_second_floor'
@@ -74,14 +74,14 @@ if $ARGS[0] = 'floor_3':
 	$menu_arg = 'floor_3'
 	menu_off = 0
 	gs 'stat'
-	'<center>3rd floor of the apartment building</center>'
+	'<center>Third Floor</center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/stairs3.jpg"></center>'
-	'<center>The third floor stairwell is decently clean and fairly well maintained. There is the occasional flickering light or even a light out, which are often not fixed for weeks.</center>'
+	'The third floor stairwell is decently clean and fairly well maintained except for the occasional flickering or busted light, which is often not fixed for weeks.'
 	if rand(0,3) = 0 and ((minut + 60*(hour+daystart*24) - floor3_event_time) > 60) or ((daystart+1)*1440 < floor3_event_time):
 		floor3_event_time = minut + 60*(hour+daystart*24)
 		gt 'city_apt_building', 'floor3_events', '<<$ARGS[1]>>'
 	else
-		'<br>The stairwell is empty.'
+		'The stairwell is empty.'
 	end
 	act 'Go down to the second floor': minut +=1 & gt 'city_apt_building','floor_2'
 	act 'Go up to the fourth floor': minut +=1 & gt 'city_apt_building','floor_4'
@@ -93,14 +93,14 @@ if $ARGS[0] = 'floor_4':
 	$menu_arg = 'floor_4'
 	menu_off = 0
 	gs 'stat'
-	'<center>4th floor of the apartment building</center>'
+	'<center>Fourth Floor</center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/stairs3.jpg"></center>'
-	'<center>The fourth floor stairwell is decently clean and fairly well maintained. There is the occasional flickering light or even a light out, which are often not fixed for weeks.</center>'
+	'The fourth floor stairwell is decently clean and fairly well maintained except for the occasional flickering or busted light, which is often not fixed for weeks.'
 	if rand(0,3) = 0 and ((minut + 60*(hour+daystart*24) - floor4_event_time) > 60) or ((daystart+1)*1440 < floor4_event_time):
 		floor4_event_time = minut + 60*(hour+daystart*24)
 		gt 'city_apt_building', 'floor4_events'
 	else
-		'<br>The stairwell is empty.'
+		'The stairwell is empty.'
 	end
 	act 'Go down to the third floor': minut +=1 & gt 'city_apt_building','floor_3'
 	act 'Go up to the fifth floor': minut +=1 & gt 'city_apt_building','floor_5'
@@ -115,19 +115,19 @@ if $ARGS[0] = 'floor_5':
 	$menu_arg = 'floor_5'
 	menu_off = 0
 	gs 'stat'
-	'<center>Floor #5</center>'
+	'<center>Fifth Floor</center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/stairs3.jpg"></center>'
-	'<center>The fifth floor stairwell looks like most of the other floors, but it has a final set of stairs at the other end of the hall that go up to the roof.</center>'
+	'The fifth floor stairwell looks much like the other floors, but has a final set of stairs at the other end of the hall that go up to the roof.'
 	if rand(0,3) = 0 and ((minut + 60*(hour+daystart*24) - floor5_event_time) > 60) or ((daystart+1)*1440 < floor5_event_time):
 		floor5_event_time = minut + 60*(hour+daystart*24)
 		gt 'city_apt_building', 'floor5_events'
 	else
-		'<br>The stairwell is empty.'
+		'The stairwell is empty.'
 	end
 	act 'Go down to the fourth floor': minut +=1 & gt 'city_apt_building','floor_4'
 	act 'Go up to the roof': minut +=1 & gt 'city_apt_building', 'roof'
 	act 'Take the elevator': gt 'city_apt_building','lift','floor_5'
-	act 'Apartment 49: Your home':gt 'korr'
+	act 'Apartment 69: Your home': gt 'korr'
 end
 
 if $ARGS[0] = 'roof':
@@ -153,7 +153,7 @@ if $ARGS[0] = 'roof':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof/roofn.jpg"></center>'
 		end
 	end
-	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenance area. There are several ventilation stacks on the roof as well.</center>'
+	'<center>The roof is fairly flat, with the roof access door in a raised part in the middle of the roof. Along one of the walls is another door to some type of storage or maintenance area. There are several ventilation stacks dotted around the roof.</center>'
 
 	act 'Go down to the fifth floor':
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
@@ -200,11 +200,11 @@ if $ARGS[0] = 'roof':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof/nude.jpg"></center>'
 				if krem = 0:
 					pcs_tan += 1
-					'You strip out of your clothes until you are naked, then lie down to sunbathe.'
+					'You strip out of your clothes and lie down to sunbathe.'
 				elseif krem > 0:
 					krem -= 1
 					pcs_tan += 3
-					'You strip out of your clothes until you are naked, then put sunblock on your body and lie down on the roof to sunbathe.'
+					'You strip out of your clothes, put sunblock on your body and lie down on the roof to sunbathe.'
 				end
 				act 'Get Up':gt 'city_apt_building', 'roof'
 			end
@@ -242,35 +242,35 @@ if $ARGS[0] = 'lift':
 	*clr & cla
 	minut += 1
 	gs 'stat'
-	res_lift_ev = RAND(0,150)
-	if res_lift_ev <=5:
+	res_lift_ev = rand(0,150)
+	if res_lift_ev <= 5:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator1.jpg"></center>'
-		'When the elevator door opens, you are surprised to see a middle-aged naked woman handcuffed to the lift railing. She looks at you in panic, but you''re too baffled to do anything until she says "Can you please push floor three?"'
+		'When the elevator door opens, you''re surprised to see a middle-aged naked woman handcuffed to the lift railing. She looks at you in panic, but you''re too baffled to do anything until she says "Can you please push floor three?"'
 		'You nod, reach in and push the button to go up to floor three. The doors close and the elevator moves away from you.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
-	elseif res_lift_ev <=10:
+	elseif res_lift_ev <= 10:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator2.jpg"></center>'
-		'When the elevator door opens, you see a woman dressed in lingerie standing inside, her tits hanging out of her bra with her coat pulled back to show off her body! At first her eyes are closed, but when she opens them, she looks at you in panic and begins frantically pressing all of the elevator buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
+		'When the elevator door opens, you see a woman dressed in lingerie standing inside, her breasts hanging out of her bra with her coat pulled back to show off her body. At first her eyes are closed, but when she opens them, she looks at you in panic and frantically presses all of the elevator buttons. You''re too baffled to do anything as the door closes.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	elseif res_lift_ev <=15:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator4_'+rand(1,2)+'.jpg"></center>'
-		'When the elevator door opens, you see a naked woman standing in it. She looks at you in panic and begins frantically pressing all of the elevator buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
+		'When the elevator door opens, you see a naked woman standing in it. She looks at you in panic and begins frantically pressing all of the elevator buttons. You''re too baffled to do anything as the door closes.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
-	elseif res_lift_ev <=20:
+	elseif res_lift_ev <= 20:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator3_'+rand(1,2)+'.jpg"></center>'
-		'When the elevator door opens, you see a young man standing it with his limp dick hanging out! He has a huge smile on his face.'
+		'When the elevator door opens, you see a young man standing it with his limp dick hanging out. He has a huge smile on his face.'
 		if hotcat >= 6:
 			'He looks you over and his smile turns into a grin, obviously liking what he sees. "Get in here and go down, so I can go up." He then laughs at his own joke.'
 			'You''re too baffled to do anything and just stand there staring at him before he speaks up. "Come on, don''t be shy! Get that tight little body over here and wrap those beautiful lips around my cock."'
@@ -280,17 +280,17 @@ if $ARGS[0] = 'lift':
 			'You''re too baffled to do anything and just stand there staring at him before he speaks up. "Well come on, it isn''t going to suck itself."'
 			'When you still don''t move, he frowns and pushes one of the buttons. "Whatever, a fugly chick like you should be thankful I even offered!" You just stand there as the door closes and the elevator moves away from you.'
 		else
-			'His smile fades as he looks you over and gives you a slightly disgusted look. "Oh it''s you... I was hoping for a hot bitch." he whines before reaching over to push one of the elevator buttons. You''re too baffled and insulted to do anything as the door closes and the elevator moves away from you.'
+			'His smile fades as he looks you over and gives you a disgusted look. "Oh it''s you... I was hoping for a hot bitch," he whines before reaching over to push one of the elevator buttons. You''re too baffled and insulted to do anything as the door closes.'
 		end
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
-	elseif res_lift_ev <=25:
+	elseif res_lift_ev <= 25:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator5.jpg"></center>'
-		'When the elevator door opens, you see a woman standing in it. She looks at you and smiles, then pulls her top down to expose her tits, followed by pulling up her skirt and showing off her neatly trimmed pussy. She then reaches across and pushes one of the buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
+		'When the elevator door opens, you see a woman standing in it. She looks at you and smiles, then pulls her top down to expose her breasts, followed by pulling up her skirt and showing off her neatly trimmed pussy, before she reaches across and pushes one of the buttons. You''re too baffled to do anything as the door closes.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
-	elseif res_lift_ev <=30:
+	elseif res_lift_ev <= 30:
 		*clr & cla
 		minut += 1
 		gs 'stat'
@@ -299,21 +299,21 @@ if $ARGS[0] = 'lift':
 		if hotcat >= 6:
 			'She looks at you and gives you an inviting smile, then motions at you with her hand. "You can join us if you want."'
 			'Her talking makes him finally look over at you and he smiles as well. "Yeah, come join us."'
-			'You''re too baffled to do anything and just stand there staring at them before he speaks up. "Sorry, but we''re full in here." This makes her laugh as he pushes one of the buttons. The doors close and the elevator begins moving away from you.'
+			'You''re too baffled to do anything and just stand there staring at them before he speaks up. "Sorry, but we''re full in here." This makes her laugh as he pushes one of the buttons and the doors close.'
 		else
-			'She looks at you and laughs slightly, and then reaches over to push one of the elevator buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
+			'She looks at you and laughs slightly, then reaches over to push one of the elevator buttons. You''re too baffled to do anything as the door closes.'
 		end
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
-	elseif res_lift_ev <=35:
+	elseif res_lift_ev <= 35:
 		*clr & cla
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/elevator7.jpg"></center>'
-		'When the elevator door opens, you see two naked women standing in it. They look at you and then each other before laughing as one of them quickly reaches across and pushes one of the buttons. You''re too baffled to do anything until it''s too late. The door is already closed again, and the elevator is moving away from you.'
+		'When the elevator door opens, you see two naked women standing in it. They look at you and then each other before laughing as one of them quickly reaches across and pushes one of the buttons. You''re too baffled to do anything as the door closes.'
 		act 'Leave': gt 'city_apt_building',$ARGS[1]
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/lift.jpg"></center>'
-		'<center>The elevator in the apartment building was renovated at some point, it is still fairly old but in good working order.'
+		'The elevator in the apartment building was renovated at some point, but is still fairly old. It''s in good working order though.'
 		act 'Push button: Floor 1': gt 'city_apt_building','floor_1', 'from_lift'
 		act 'Push button: Floor 2': gt 'city_apt_building','floor_2'
 		act 'Push button: Floor 3': gt 'city_apt_building','floor_3', 'from_lift'
@@ -324,10 +324,10 @@ if $ARGS[0] = 'lift':
 end
 
 if $ARGS[0] = 'pod_objava':
-		*clr & cla
-		minut += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
 	act 'Continue': gt 'city_apt_building','floor_1'
 end
 
@@ -342,7 +342,7 @@ if $ARGS[0] = 'floor1_events':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor1_gop.jpg"></center>'
-	'A large group of gopnik boys are blocking the stairs up to the first floor. You''ve seen several of them in the building and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous, especially in large groups. You could try and walk past them, or just leave.'
+	'A large group of gopniks are blocking the stairs up to the first floor. You''ve seen several of them in the building and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous, especially in large groups. You could try and walk past them, or just leave.'
 	act 'Leave': 
 		if $ARGS[1] = 'from_second_floor':
 			minut += 1 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'floor1_events':
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/lift.jpg"></center>'
-			'<center>You get back in the elevator and decide to take it to another floor.'
+			'You get back in the elevator and decide to take it to another floor.'
 			act 'Push button: Floor 2': gt 'city_apt_building','floor_2'
 			act 'Push button: Floor 3': gt 'city_apt_building','floor_3', 'from_lift'
 			act 'Push button: Floor 4': gt 'city_apt_building','floor_4'
@@ -367,10 +367,13 @@ if $ARGS[0] = 'floor1_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor1_gop.jpg"></center>'
-		if hotcat >= 5:
-			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you. "Hey sweetheart, have a seat and drink with us.", "Damn girl you look fine, take a seat and take a load off, maybe help us get a load off!" which gets several of them to laugh. "Don''t be shy beautiful, we won''t bite, unless you ask us nicely." Several even ruder comments are said, followed by them laughing even more.'
-			*nl
-			'Several of them paw at your legs, or squeeze your ass. A few reach up and grab your breasts and squeeze, one even rubs your crotch. You do your best to fend off the groping hands but there are just too many of them. You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
+		if hotcat >= 6:
+			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.' 
+			'"Hey sweetheart, have a seat and drink with us."'
+			'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"' 
+			'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."' 
+			'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.' 
+			'You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
 			gs 'arousal', 'foreplay', 3, 'humiliation'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -378,7 +381,10 @@ if $ARGS[0] = 'floor1_events':
 			minut += 2
 			pcs_mood -= 15
 			gs 'stat'
-			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments. "Watch where you''re stepping you fat cow.", "Anyone else smell rotten fish?" and other such comments. At one point you think one of them might do something, but you make it past them unharmed. However, you are a little upset at the comments made towards you.'
+			'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.' 
+			'"Watch where you''re stepping, you fat cow!"' 
+			'"Anyone else smell rotten fish?"' 
+			'At one point, you think one of them might do something, but you make it past them unharmed. However, you''re a little upset at the comments made towards you.'
 		end
 		act 'Leave the building': minut += 1 & gt 'city_residential', 'start'
 		act 'Go up to the second floor': minut +=1 & gt 'city_apt_building','floor_2'
@@ -402,13 +408,13 @@ if $ARGS[0] = 'floor2_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_drunk.jpg"></center>'
-		'There are a couple of young girls sitting on the steps, drinking. They both look pretty wasted. Just as you start to walk past them, one of them suddenly throws up. Her friend quickly scoots away from her and looks like she is about to throw up as well. The smell of the vomit makes you feel a little ill yourself. You quickly, while being careful not to step in the vomit, make your way past them.'
+		'There are a couple of young girls sitting on the steps who both look pretty wasted. Just as you start to walk past them, one of them suddenly throws up. Her friend quickly scoots away from her and looks like she''s about to throw up as well. The smell of the vomit makes you feel a little ill yourself. You quickly make your way past them, being careful not to step in the vomit.'
 		act 'Continue': gt 'city_apt_building', 'floor_2'
 	elseif floor2 = 6:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_flash.jpg"></center>'
-		'A young woman stops on the stairs to the third floor in front of a young man. She pulls down her yoga pants, bending forward slightly, with her legs spread a bit. She gives the young man a nice view of her naked ass and pussy, and he stops dead in his tracks when confronted with the view. The girl then giggles, pulls up her pants and runs up the stairs. The young man takes off after her, gaining on her quickly. They soon disappear on the next floor up and shortly afterwards you hear her squealing in delight.'
+		'A young woman stops on the stairs to the third floor in front of a young man. She pulls down her yoga pants and bends forward slightly with her legs spread. She gives the young man a nice view of her naked ass and pussy, and he stops dead in his tracks when confronted with the view. The girl then giggles, pulls up her pants and runs up the stairs. The young man takes off after her, gaining on her quickly. They soon disappear on the next floor up and shortly afterwards you hear her squealing in delight.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -419,14 +425,14 @@ if $ARGS[0] = 'floor2_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_girl.jpg"></center>'
-		'You see a young woman, about your age, leaning against the wall. She is dressed in a tight, partially see-through, half-shirt that shows off her flat stomach, a very short skirt and mid calf high-heeled boots. All in all, fairly slutty. She looks at you as you approach and gives you a friendly smile. You exchange hellos before you go on your way.'
+		'You see a young woman about your age leaning against the wall. She''s dressed in a tight, partially see-through, half-shirt that shows off her flat stomach, a very short skirt and mid calf high-heeled boots. She looks at you as you approach and gives you a friendly smile. You exchange hellos before you go on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_2'
 	elseif floor2 = 10 or floor2 = 11:
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_gop.jpg"></center>'
-		'Sitting on the stairs are two young gopnik boys with a gopnik girl between them. They are all drinking from bottles and look a little drunk. They are all a few years younger than you. As you squeeze your way past them they give you dirty looks, but don''t say anything.'
+		'Sitting on the stairs are two young gopnik boys with a gopnik girl between them. They''re all drinking from bottles and look a little drunk. As you squeeze your way past them, they give you dirty looks, but don''t say anything.'
 		act 'Continue': gt 'city_apt_building', 'floor_2'
 	elseif floor2 = 12:
 		*clr & cla
@@ -441,7 +447,7 @@ if $ARGS[0] = 'floor2_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_nudedoor.jpg"></center>'
-		'You see a woman standing outside, next to an apartment door. You are quite distracted as she is naked from the waist up, having been in the process of pulling her dress down while a man watched. When she sees you, she panics and quickly pulls her dress back up before running into the apartment. The young man laughs, looks at you and winks before following her inside.'
+		'You see a woman standing next to an apartment door naked from the waist up, having been in the process of pulling her dress down while a man watched. When she sees you, she panics and quickly pulls her dress back up before running into the apartment. The young man laughs, looks at you and winks before following her inside.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -450,7 +456,7 @@ if $ARGS[0] = 'floor2_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor2_up.jpg"></center>'
-		'As you get to the stairwell landing, you see a woman walking up to the third floor. You can''t help but notice her skirt is very short and she is not wearing any panties. As she nears the top of the stairs you get a clear view of her pussy. You are unsure if she is aware that she has herself on display or not, she acts like she isn''t aware but she might just enjoy it. Either way, a moment later she is on the next floor and out of sight.'
+		'As you get to the stairwell landing, you see a woman walking up to the third floor. You notice that her skirt is very short and that she isn''t wearing any panties. As she nears the top of the stairs, you get a clear view of her pussy. You''re unsure if she was aware that she had herself on display or not.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -459,7 +465,7 @@ if $ARGS[0] = 'floor2_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor2_bj.jpg"></center>'
-		'Sitting on the stairs is a naked man and a woman dressed in see through lingerie. She is squatting in front of him with her legs spread, showing off her pussy while she sucks his dick. He looks at you as you approach and gives you a huge smile. He backs up against the wall as best as he can and pulls her over a bit, giving you just enough room to squeeze past them. She never does stop giving him a blowjob, even as you brush past her.'
+		'Sitting on the stairs is a naked man and a woman dressed in see through lingerie. She''s squatting in front of him with her legs spread, showing off her pussy while she sucks his dick. He looks at you as you approach and gives you a huge smile. He backs up against the wall as best as he can and pulls her over, giving you just enough room to squeeze past them. She never does stop giving him a blowjob, even as you brush past her.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -478,7 +484,7 @@ if $ARGS[0] = 'floor3_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_clothed.jpg"></center>'
-		'You see one of your neighbors, a young woman about your age. You''re not sure you would call her a gopnik, since she is dressed in alternative clothing, but she is doing the gopnik squat in a corner. She gives you a friendly smile and a wave. You exchange hellos before you go on your way.'
+		'You see one of your neighbors, a young woman about your age dressed in an alternative style. She gives you a friendly smile and a wave and you exchange hellos before you go on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_3'
 	elseif floor3 = 3 or floor3 = 4:
 		*clr & cla
@@ -486,7 +492,7 @@ if $ARGS[0] = 'floor3_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_drunk.jpg"></center>'
-		'A young woman appears to be passed out on the landing, her belongings sitting on the stairs near her. You have no idea how long she has been here.'
+		'A young woman appears to be passed out on the landing, her belongings sitting on the stairs near her. You have no idea how long she''s been here.'
 		act 'Ignore her and continue': gt 'city_apt_building', 'floor_3'
 		act 'Help her': 
 			*clr & cla
@@ -494,7 +500,7 @@ if $ARGS[0] = 'floor3_events':
 			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_drunk.jpg"></center>'
-			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get to close to her. You shake her and she doesn''t wake up. You squat down next to her, grabbing both of her shoulders, and shake her really hard. It takes a few minutes of shaking but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on the next floor up and help her upstairs to her apartment. She tries to use her keys to open the door, but fails and drops them.'
+			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get to close to her. You shake her, but she doesn''t wake up, so you squat down next to her, grab her shoulders, and shake her really hard. It takes a few minutes, but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on the next floor up and help her upstairs to her apartment. She tries to use her keys to open the door, but fails and drops them.'
 		    'Before you can pick up the keys, the door opens. An older woman takes one look at the drunk woman and start ranting at her. She takes the young woman from you and thanks you for helping her. Once she has retrieved the keys from the floor and helped the young woman inside, she closes the door. You can hear her berating the younger woman through the door.'
 			act 'Continue': gt 'city_apt_building', 'floor_4'
 		end
@@ -502,7 +508,7 @@ if $ARGS[0] = 'floor3_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_flash.jpg"></center>'
-		'An older woman stops on the stairs to the fourth floor for a moment, in front of an older man. She pulls her skirt up, briefly exposing her pussy to him before she drops her skirt back in place and he walks up the few steps to her and gives her a kiss. After they kiss a bit, they walk down the stairs hand-in-hand.'
+		'An older woman stops on the stairs to the fourth floor in front of an older man. She pulls her skirt up, briefly exposing her pussy to him before she drops her skirt back in place and he walks up the few steps to her and gives her a kiss. After they finish kissing, they walk down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -513,14 +519,14 @@ if $ARGS[0] = 'floor3_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_girls.jpg"></center>'
-		'Two young girls sit on the stairs filling bottles of juice with vodka. They both look a few years younger than you. They, for the most part, ignore you as you walk past them, intent on their task at hand.'
+		'Two young girls sit on the stairs filling bottles of juice with vodka. They ignore you as you walk past them, intent on their task at hand.'
 		act 'Continue': gt 'city_apt_building', 'floor_3'
 	elseif floor3 = 9 or floor3 = 10 or floor3 = 11:
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_gop.jpg"></center>'
-		'In the stairwell between the floors is a large group of gopnik boys. You have seen several of them in the building, and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous especially in large groups. You could try and walk past them, or just leave.'
+		'In the stairwell between the floors is a large group of gopniks. You''ve seen several of them in the building, and most of the rest around the neighborhood. You don''t think most of them live here. You know gopniks can be dangerous especially in large groups. You could try and walk past them, or just leave.'
 		act 'Leave': 
 			if $ARGS[1]= 'from_second_floor':
 				minut += 1 
@@ -545,10 +551,13 @@ if $ARGS[0] = 'floor3_events':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_gop.jpg"></center>'
-			if hotcat >= 5:
-				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, which are soon followed by them groping you. "Hey sweetheart, have a seat and drink with us.", "Damn girl, you look fine! Take a seat and take a load off, maybe help us get a load off!" which gets several of them to laugh. "Don''t be shy beautiful, we won''t bite. Not unless you ask us to nicely." Several even ruder comments are made, followed by them laughing even more.'
-				*nl
-				'Several of them paw at your legs, or squeeze your ass. A couple reach up and grab your breasts and squeeze, one even rubs your crotch. You do your best to fend off the groping hands but there are just too many of them and you feel yourself starting to panic. They might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
+			if hotcat >= 6:
+				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them make comments, soon followed by them groping you.' 
+				'"Hey sweetheart, have a seat and drink with us."'
+				'"Damn girl you look fine. Take a seat and take a load off, maybe help us get a load off!"' 
+				'"Don''t be shy beautiful, we won''t bite. Unless you ask us nicely."' 
+				'Several even ruder comments are said, followed by them laughing as they start pawing at your legs and squeezing your ass. A few reach up and squeeze your breasts and one even rubs your crotch. You do your best to fend off the groping hands but there''s just too many of them.' 
+				'You feel yourself starting to panic, thinking they might not stop at just groping. Thankfully, when you finally get past them, they stay seated.'
 				gs 'arousal', 'forplay', 3, 'humiliation'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -556,7 +565,10 @@ if $ARGS[0] = 'floor3_events':
 				minut += 2
 				pcs_mood -= 15
 				gs 'stat'
-				'You decide to push on and go past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments. "Watch where you''re stepping you fat cow.", "Anyone else smell rotten fish?" and other such comments. You think one of them might do something, but you make it past them unharmed. However, you are a little upset at the comments directed towards you.'
+				'You decide to push on and walk past them. As you carefully step around them, you can''t help but brush up against them. Several of them give you dirty looks and others make comments.' 
+				'"Watch where you''re stepping, you fat cow!"' 
+				'"Anyone else smell rotten fish?"' 
+				'At one point, you think one of them might do something, but you make it past them unharmed. However, you''re a little upset at the comments made towards you.'
 			end
 			act 'Go down to the second floor': minut +=1 & gt 'city_apt_building','floor_2'
 			act 'Go up to the fourth floor': minut +=1 & gt 'city_apt_building','floor_4'
@@ -577,13 +589,13 @@ if $ARGS[0] = 'floor3_events':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_nudedoor.jpg"></center>'
 		if meet_nudedoor_woman3 = 0:
 			meet_nudedoor_woman3 = 1
-			'As you are about to walk by one of the apartments, the door suddenly opens. A young, nude woman is standing there, wearing only a smile. She laughs a little when she sees you. "Sorry I thought you were someone else."'
+			'As you''re about to walk by one of the apartments, the door suddenly opens. A young, nude woman is standing there, wearing only a smile. She laughs when she sees you. "Sorry, I thought you were someone else."'
 			'You can''t help but smile back at her. "It''s okay, I don''t mind."'
-			'She laughs at that. "Well, nice meeting you." she says before closing the door.'
+			'She laughs again. "Well, nice meeting you," she says before closing the door.'
 		else
-			'As you are about to walk by one of the apartments, the door suddenly opens. A young, nude woman is standing there wearing only a smile. She laughs when she sees you again. "Sorry again, I thought you were my boyfriend coming home."'
-			'You can''t help but smile back at her. "Not a problem. He is a lucky man to have you greet him in such a way."'
-			'She laughs at that. "Thanks! Well, nice seeing you again." she says before closing the door.'
+			'As you''re about to walk by one of the apartments, the door suddenly opens. A young, nude woman is standing there wearing only a smile. She laughs when she sees you again. "Sorry again, I thought you were my boyfriend coming home."'
+			'You can''t help but smile back at her. "Not a problem. He''s a lucky man to have you greet him in such a way."'
+			'She laughs at that. "Thanks! Well, nice seeing you," she says before closing the door.'
 		end
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
@@ -593,7 +605,7 @@ if $ARGS[0] = 'floor3_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor3_up.jpg"></center>'
-		'As you get to the stairwell landing, you see a woman walking up to the fourth floor with a man following her. As she nears the top of the stairs, she lifts her skirt and shows off her naked ass. The guy laughs and then lunges for her, but she giggles and takes off up the stairs. A moment later they disappear, shortly followed by the sound of a door opening and closing.'
+		'As you get to the stairwell landing, you see a woman walking up to the fourth floor with a man following her. As she nears the top of the stairs, she lifts her skirt and shows off her naked ass. The guy laughs and lunges for her, but she giggles and takes off up the stairs, shortly followed by the sound of a door opening and closing.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -603,7 +615,7 @@ if $ARGS[0] = 'floor3_events':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor3_ir.jpg"></center>'
-		'You see a middle-aged woman making out with a younger, black man. Her hand is on the doorknob of a slightly opened apartment door, which you assume is hers. You don''t know if the man lives with her or not. They seem completely oblivious to you as you walk past them.'
+		'You see a middle-aged woman making out with a younger, black man. Her hand is on the doorknob of a slightly opened apartment door, which you assume is hers. They seem completely oblivious to you as you walk past them.'
 		gs 'arousal', 'erotic', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -623,7 +635,8 @@ if $ARGS[0] = 'floor3_events':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor3_fuck.jpg"></center>'
-		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the stairs, you see a woman in the stairwell on her back, but you can''t really make her out, other than her bare legs spread wide. A man is thrusting between her legs with his pants pulled down. Another man appears to be passed out, or sleeping, next to the two having sex. You are unsure what the story is here, but you figure it is likely a good one and that the sleeping man will likely not enjoy the story as much as everyone else, if he ever learns of it.'
+		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the stairs, you see a woman in the stairwell on her back, but you can''t really make her out, other than her bare legs spread wide. A man is thrusting between her legs with his pants pulled down.' 
+		'Another man appears to be passed out, or sleeping, next to the two having sex. You''re unsure what the story is here, but you figure it''s likely a good one and that the sleeping man will likely not enjoy the story as much as everyone else, if he ever learns of it.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -644,7 +657,7 @@ if $ARGS[0] = 'floor4_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_clothed.jpg"></center>'
-		'You see one of your neighbors, a young woman about your age, sitting on the steps. She scoots over when you approach to allow you to walk past her. She gives you a friendly smile and a wave. You exchange hellos before you go on your way.'
+		'You see one of your neighbors, a young woman about your age, sitting on the steps. She scoots over when you approach to allow you to walk past her. She gives you a friendly smile and a wave and you exchange hellos before you go on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_4'
 	elseif floor4 = 4 or floor4 = 5:
 		*clr & cla
@@ -652,7 +665,7 @@ if $ARGS[0] = 'floor4_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_drunk.jpg"></center>'
-		'A young woman appears to be passed out on the stairs, her belongings sitting on the stairs near her. You have no idea how long she has been laying here.'
+		'A young woman appears to be passed out on the stairs, her belongings sitting on the stairs near her. You have no idea how long she''s been here.'
 		act 'Ignore her and continue': gt 'city_apt_building', 'floor_4'
 		act 'Help her': 
 			*clr & cla
@@ -660,7 +673,7 @@ if $ARGS[0] = 'floor4_events':
 			pcs_mood += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_drunk.jpg"></center>'
-			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get close to her. You shake her and she doesn''t wake up. You squat down next to her, grabbing both her shoulders, and shake her really hard. It takes a few minutes of shaking but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on this floor and you help her to her apartment. She tries to use her keys to open the door, but fails and drops them.'
+			'You stop to check on her. She seems fine, but you can smell the alcohol on her before you even get close to her. You shake her, but she doesn''t wake up, so you squat down next to her, grab her shoulders, and shake her really hard. It takes a few minutes, but she finally wakes up, her breath having a near overwhelming smell of alcohol on it. She mutters something about five more minutes, but you finally manage to get her up and on her feet. You find out she lives on this floor and you help her to her apartment. She tries to use her keys to open the door, but fails and drops them.'
 			'Before you can pick up the keys, the door opens. An older woman takes one look at the drunk woman and starts ranting at her. She takes the young woman from you and thanks you for helping her. Once she has retrieved the keys from the floor and helped the young woman inside, she closes the door. You can hear her berating the younger woman through the door.'
 			act 'Continue': gt 'city_apt_building', 'floor_4'
 		end
@@ -668,7 +681,7 @@ if $ARGS[0] = 'floor4_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_flash.jpg"></center>'
-		'A middle-aged woman stops on the stairs to the fifth floor for a moment, in front of a man around her age. She pulls her skirt up, exposing her pussy to the man. She drops the skirt back in place and he walks up the few steps to her and gives her a kiss. After they kiss a bit, they walk down the stairs hand-in-hand.'
+		'A middle-aged woman stops on the stairs to the fifth floor in front of a man around her age. She pulls her skirt up, exposing her pussy to the man. She drops the skirt back in place and he walks up the few steps to her and gives her a kiss. After they finish kissing, they walk down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -679,21 +692,21 @@ if $ARGS[0] = 'floor4_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_girls.jpg"></center>'
-		'Two young girls sit on the stairs talking. They both look a few years younger than you. They, for the most part, ignore you as you walk past them - absorbed in their conversation. You can''t help but overhear parts of their conversation. Boys. They are talking about how cute some boys that they know are.'
+		'Two young girls sit on the stairs talking. They ignore you as you walk past them, absorbed in their conversation about some cute boys they know.'
 		act 'Continue': gt 'city_apt_building', 'floor_4'
 	elseif floor4 = 10 or floor4 = 11 or floor3 = 12:
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_gop.jpg"></center>'
-		'In the stairwell between the floors are three gopnik boys, with a young girl out between them who appears to be so drunk she is nearly out of it completely. One of them has pulled her shirt part way up as you approach them. As you look at the girl, one of them says. "Mind your own business, bitch!"'
-		'She doesn''t seem to be trying to stop them from groping her or pulling at her clothes. Not sure what else to do you continue on your way.'
+		'In the stairwell between the floors are three gopnik boys, with a young girl out between them who looks completely wasted. One of them has pulled her shirt part way up as you approach them. As you look at the girl, one of them says. "Mind your own business, bitch!"'
+		'She doesn''t seem to be trying to stop them from groping her or pulling at her clothes. Not sure what else to do, you continue on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_4'
 	elseif floor4 = 13:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_naked.jpg"></center>'
-		'In the stairwell between the floors you see a girl, about your age, leaning against the wall. She is completely naked and smoking a cigarette. When she sees you, she smiles. "Hello!" she says, as if everything was normal. You greet her in return and try not to stare. She continues to smoke as you walk by her.'
+		'In the stairwell between the floors you see a girl about your age leaning against the wall, completely naked and smoking a cigarette. When she sees you, she smiles. "Hello!" she says, as if everything was normal. You greet her in return and try not to stare as she continues to smoke and you walk by her.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -704,13 +717,13 @@ if $ARGS[0] = 'floor4_events':
 		meet_nudedoor_woman3 = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_shop'+rand(1,2)+'.jpg"></center>'
-		'You see a beautiful woman dressed in nice clothes carrying a shopping bag. You have seen her around before and you know she lives on this floor. Almost every time you see her she is carrying some shopping bags. She either makes plenty of money or someone else buys her a lot of stuff. She smiles at you as she heads towards her apartment.'
+		'You see a beautiful woman dressed in nice clothes carrying a shopping bag. You''ve seen her around before and you know she lives on this floor. Almost every time you see her, she''s carrying some shopping bags. She either makes plenty of money or someone else buys her a lot of stuff. She smiles at you as she heads towards her apartment.'
 		act 'Leave': gt 'city_apt_building', 'floor_4'
 	elseif floor4 = 17:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor4_up.jpg"></center>'
-		'As you get to the stairwell landing you see a man looking up the stairs at a middle aged-woman. She is wearing a robe that is hanging wide open. She is completely naked, her breasts and trimmed pussy on full display. They both look at you and smile before the guy pulls out his phone and starts taking pictures. After that they both ignore you as you go on your way.'
+		'As you get to the stairwell landing you see a man looking up the stairs at a middle aged-woman wearing a robe that''s hanging wide open, her breasts and trimmed pussy on full display. They both look at you and smile before the guy pulls out his phone and starts taking pictures. After that, they both ignore you as you go on your way.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -719,9 +732,8 @@ if $ARGS[0] = 'floor4_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bdsm.jpg"></center>'
-		'On the landing, bent over the railing, is a woman. She is wearing black baby doll lingerie, stockings and black high heels, as well as ankle and wrist cuffs. The ankle cuffs are attached to the railing in a way that forces her legs apart. Her hands are attached on the other side of the railing together. She blushes when she sees you, but you also notice that she smiles as she looks away from you. You get the feeling she is enjoying the humiliation of being found like this.'
-		*nl
-		'As you walk past her, you can''t help but notice she is not wearing panties under the baby doll lingerie. This gives you a full view of her pussy and the cum dripping down her inner thighs. You glance around but don''t see anyone else around, and she seems content to remain like this, so you go on your way.'
+		'On the landing, bent over the railing, is a woman wearing black baby doll lingerie, stockings and black high heels, as well as ankle and wrist cuffs. The ankle cuffs are attached to the railing in a way that forces her legs apart. Her hands are attached on the other side of the railing together. She blushes when she sees you, but you also notice that she smiles as she looks away from you. You get the feeling she''s enjoying the humiliation of being found like this.'
+		'As you walk past her, you can''t help but notice she''s not wearing panties under the baby doll lingerie. This gives you a full view of her pussy and the cum dripping down her inner thighs. You glance around but don''t see anyone else around, and she seems content to remain like this, so you go on your way.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -730,7 +742,7 @@ if $ARGS[0] = 'floor4_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bottle.jpg"></center>'
-		'As you make your way to the stairs you notice a few gopnik boys, who seem focused on someone else as they are giving them encouragement to keep going. As you get close enough, you see a young woman naked from the waist down fucking her ass with a bottle. When she sees you, she blushes and quickly jumps up and runs down one of the hallways. She is quickly followed by the boys, one of whom pauses long enough to give you a dirty look for ruining their fun.'
+		'As you make your way to the stairs you notice a few gopnik boys, who seem focused on someone else as they''re giving them encouragement to keep going. As you get close enough, you see a young woman naked from the waist down fucking her ass with a bottle. When she sees you, she blushes and quickly jumps up and runs down one of the hallways. She''s quickly followed by the boys, one of whom pauses long enough to give you a dirty look for ruining their fun.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -739,7 +751,7 @@ if $ARGS[0] = 'floor4_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_bj.jpg"></center>'
-		'A young man stands on the stairs in the stairwell with his pants pulled down just enough for his cock to be free. A girl, about his age, is bent over and sucking his dick for all it is worth. As you move past them, he grins at you and grabs hold of the back of her head with his hands and starts face fucking the girl. He begins forcing his dick balls deep into her mouth and down her throat, and you can hear her gagging. Just before the sounds of them fade completely you hear him say "Fuck yeah, swallow it bitch!"'
+		'A young man stands on the stairs in the stairwell with his pants pulled down just enough for his cock to be free. A girl, about his age, is bent over and sucking his dick. As you walk past them, he grins at you as he grabs hold of the back of her head with his hands and starts forcing his dick balls deep into her mouth and down her throat, gagging her. Just before the sounds of them fade completely, you hear him say "Fuck yeah, swallow it bitch!"'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -748,7 +760,7 @@ if $ARGS[0] = 'floor4_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor4_fuck.jpg"></center>'
-		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the landing you see, down one of the halls, a light-skinned black girl, about your age. Her pants are pulled down to her knees as she leans forward with her hands on the wall, her ass sticking out. A slightly older man is fucking her from behind. She looks in your direction, but you''re not sure if she noticed you or not. She looks, and sounds, like she is really enjoying herself. You decide to move on and leave them to it.'
+		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman, by the sounds of the moans. As you get to the landing, you see a light-skinned black girl about your age, her pants pulled down to her knees as she leans forward with her hands on the wall, her ass sticking out. A slightly older man is fucking her from behind. She looks in your direction, but you''re not sure if she noticed you or not. She looks, and sounds, like she''s really enjoying herself. You decide to move on and leave them to it.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -756,26 +768,26 @@ if $ARGS[0] = 'floor4_events':
 	elseif floor4 = 22 or floor4 = 23 and (week < 6 and hour >= 19 and hour <= 23) or (week >=6 and hour >= 10 and hour <= 23):
 		'<center><img <<$set_imgh>> src=images/characters/city/tryndin/tryndin_stairs.jpg></center>'
 		if trychat = 0:
-			'You see a young man, around your sister''s age, in the hallway. You can''t help but notice that he''s pretty good looking. He looks up at you as you get close and gives you a pleasant smile. "You''ve moved into apartment 49, right?"'
+			'You see a young man, around your sister''s age, in the hallway. You can''t help but notice that he''s pretty good looking. He looks up at you as you get close and gives you a pleasant smile. "You''ve moved into apartment 69, right?"'
 			act 'Yes':
 				*clr & cla
 				trychat += 1
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big77.jpg"></center>'
-				'You nod. "Yeah, I live in apartment 49." you tell him.'
-				'The guy looks visibly delighted and says "Wonderful, it''s always nice meeting new people. By the way I''m Tryndin, and you are?"'
+				'You nod. "Yeah?"'
+				'The guy looks visibly delighted. "Wonderful, it''s always nice meeting new people. By the way, I''m Tryndin. You are?"'
 				act '<<$pcs_nickname>>':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big77.jpg"></center>'
-					'"My name is <<$pcs_nickname>>," you say.'
-					'He nods his head and turns towards a nearby door. The door has number 37 on it. Digging in his pocket, he pulls out a set of keys and begins to unlock the door. "That''s a pretty name. I live in this apartment here. I need to get going, but I hope to see you around." As he opens the door an elderly woman looks out at him, and then at you, giving you a disapproving look. "Mother, stop hanging around the front door!" he says in an annoyed tone before he closes the door.'
+					'"<<$pcs_nickname>>," you reply.'
+					'He nods his head and turns towards a nearby door. The door has number 37 on it. Digging in his pocket, he pulls out a set of keys and unlocks the door. "That''s a pretty name. I live in this apartment here. I need to get going, but I hope to see you around." As he opens the door, an elderly woman looks out at him, and then at you, giving you a disapproving look. "Mother, stop hanging around the front door!" he says in an annoyed tone before he closes the door.'
 					act 'Continue': gt 'city_apt_building', 'floor_4'
 				end
 			end
 		else
-			'Your neighbor, <a href="exec:Gt ''tryndin''">Tryndin</a>, is in the hallway. He''s smoking a cigarette, flicking the ashes into a jar. He gives you a nod when he notices you. "Hello."'
+			'Your neighbor, <a href="exec:gt ''tryndin''">Tryndin</a>, is in the hallway smoking a cigarette and flicking the ashes into a jar. He gives you a nod when he notices you. "Hello."'
 			act 'Say "hello" and leave': gt 'city_apt_building', 'floor_4'
 			act 'Have a chat with Tryndin': gt 'tryndin', 'stairwell_chat'
 		end
@@ -793,7 +805,7 @@ if $ARGS[0] = 'floor5_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_clothed.jpg"></center>'
-		'You see one of your neighbors, a young woman about your age, walking down the stairs to the fourth floor. She gives you a friendly smile and a wave. You exchange hellos before you go on your way.'
+		'You see one of your neighbors, a young woman about your age, walking down the stairs to the fourth floor. She gives you a friendly smile and a wave and you exchange hellos before you go on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_5'
 	elseif floor5 = 4 or floor5 = 5:
 		*clr & cla
@@ -801,13 +813,13 @@ if $ARGS[0] = 'floor5_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_drunk.jpg"></center>'
-		'On the stairs is a girl, a few years younger than you. She is drinking from a bottle and obviously very drunk. She grins at you as you approach and you exchange hellos before you go on your way.'
+		'On the stairs is a girl drinking from a bottle, clearly very drunk. She grins at you as you approach and you exchange hellos before you go on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_5'
 	elseif floor5 = 6:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_flash.jpg"></center>'
-		'A middle-aged woman at the top of the stairs is looking down at a man near the landing of the stairs below. She pulls up her top to expose her tits to him and they both laugh before she hurries down the stairs to catch up to him. They exchange a quick kiss and then walk down the stairs hand-in-hand.'
+		'A middle-aged woman at the top of the stairs is looking down at a man near the landing of the stairs below. She pulls up her top to expose her breasts to him and they both laugh before she hurries down the stairs to catch up to him. They exchange a quick kiss before walking down the stairs hand-in-hand.'
 		gs 'arousal', 'erotic_nudity', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -818,14 +830,14 @@ if $ARGS[0] = 'floor5_events':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_girls.jpg"></center>'
-		'In the hallway near the roof access are two girls and guy. One girl is sitting and looking in your direction, while the other is on all-fours with the guy behind her. They are all clothed but the guy acts like he is fucking the girl and they all seem to find it funny. They keep talking and playing around as you continue on your way.'
+		'Two girls and a guy are in the hallway near the roof access. One of the girls is sitting and looking in your direction while the other is on all-fours with the guy behind her. They''re all clothed, but the guy acts like he''s fucking the girl and they all seem to find it funny. They keep talking and playing around as you continue on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_5'
 	elseif floor5 = 10 or floor5 = 11 or floor5 = 12:
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/event/floor5_gop.jpg"></center>'
-		'In the hallway are a few gopniks, squatting next to a tiny table. They have a few drinks and some food sat on the table. They talk, laugh and smoke as they eat and drink. When you walk past them they offer you some food, but you politely decline - as it doesn''t look very good - and continue on your way.'
+		'In the hallway are a few gopniks squatting next to a tiny table with a few drinks and some food. They talk, laugh and smoke as they eat and drink. They offer you some food when you walk past, but you politely decline as it doesn''t look very good and continue on your way.'
 		act 'Continue': gt 'city_apt_building', 'floor_5'
 	elseif floor5 = 13:
 		*clr & cla
@@ -840,7 +852,8 @@ if $ARGS[0] = 'floor5_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_bdsm.jpg"></center>'
-		'In the hallway are two young woman. One is blonde and she is wearing boots and a skirt, while naked from the waist up. The other, a brunette, is completely naked with her hands are tied behind her back. As you watch the blonde puts a large collar around the other one''s neck, and then attaches a leash to it. With the leash in place, she steps back, unbinds the brunette''s hands, and slaps her on the ass. She drops to the floor on all-fours and the blonde starts walking, holding onto the leash as the brunette follows behind like a dog. The blonde smiles at you and waves and you exchange hellos with her. The brunette never says a word as they move past you. After taking a moment to reflect on what you just seen, you continue on your way.'
+		'Two young women are in the hallway. One is blonde and is wearing boots and a skirt, while naked from the waist up. The other, a brunette, is completely naked with her hands tied behind her back. You watch as the blonde puts a large collar around the other one''s neck and attaches a leash to it. With the leash in place, she steps back, unbinds the brunette''s hands and slaps her on the ass. She drops to the floor on all-fours and the blonde starts walking, holding onto the leash as the brunette follows behind like a dog. The blonde smiles at you and waves while the brunette never says a word as they move past you.' 
+		'After taking a second to reflect on what you just seen, you continue on your way.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -850,13 +863,13 @@ if $ARGS[0] = 'floor5_events':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_couple.jpg"></center>'
-		'You see a middle-aged woman making out with a younger black man. Her hand is on the doorknob of a slightly opened apartment door - you assume she lives there. You don''t know if the man lives with her or not. They seem completely oblivious to you as you walk past them.'
+		'You see a middle-aged woman making out with a younger, black man. Her hand is on the doorknob of a slightly opened apartment door, which you assume is hers. They seem completely oblivious to you as you walk past them.'
 		act 'Leave': gt 'city_apt_building', 'floor_5'
 	elseif floor5 = 17:
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_bj.jpg"></center>'
-		'A man stands on the stairs in the stairwell completely naked with his back to the wall. A woman, about his age, stands on the stairs a couple of steps down, also completely naked. She is bent forward sucking his dick for all it is worth. As you go past them, he grins at you and takes hold of the back of her head with his hands and starts face fucking the girl. He begins forcing his dick balls-deep into her mouth and down her throat, you can hear her gagging as he does so. Just before the sounds of them fades completely you hear him shout "Oh my god, that was amazing!"'
+		'A young man stands on the stairs in the stairwell with his pants pulled down just enough for his cock to be free. A girl, about his age, is bent over and sucking his dick. As you walk past them, he grins at you as he grabs hold of the back of her head with his hands and starts forcing his dick balls deep into her mouth and down her throat, gagging her. Just before the sounds of them fades completely, you hear him shout "Oh my god, that was amazing!"'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -865,7 +878,7 @@ if $ARGS[0] = 'floor5_events':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/sex/floor5_fuck.jpg"></center>'
-		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman by the sounds of the moans. As you get to the stairs, you see a woman on her back in the stairwell, but you can''t really make her out - other than her bare legs spread wide. A topless man with his pants pulled down is between her legs, thrusting. As you get closer, the man sees you and gives you a huge grin and a thumbs up. He doesn''t stop thrusting into the woman underneath him as he does. Feeling a little awkward, you continue on your way.'
+		'As you approach the stairs, you hear moaning and grunting, the obvious sounds of people having sex. A man and woman by the sounds of it. As you approach the stairs, you see a woman on her back in the stairwell, but you can''t really make her out other than her bare legs spread wide. A topless man with his pants pulled down is between her legs, thrusting. As you get closer, the man sees you and gives you a huge grin and a thumbs up. He doesn''t stop thrusting into the woman underneath him as he does. Feeling a little awkward, you continue on your way.'
 		gs 'arousal', 'erotic_sex', 3
 		gs 'arousal', 'end'
 		gs 'stat'

locations/city_center.qsrc

@@ -11,12 +11,12 @@ $location_type = 'public_outdoors'
 killvar '$locclass'
 CLOSE ALL
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >= 11 and month <= 12 or month >=1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 
@@ -25,7 +25,7 @@ bankloc = 1
 gs 'stat'
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour ! hour:gt 'street_event','city_center', 'main'
+if streetevent_hour ! hour: gt 'street_event','city_center', 'main'
 
 '<center><h2>St. Petersburg</h2></center>'
 '<center><b>City Center</b></center>'
@@ -44,10 +44,10 @@ else
 end
 *nl
 
-'Day or night, the city centre is alive and bustling. So whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
+'Day or night, the city center is alive and bustling, so whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
 *nl
 
-gs'street_event','city_center', 'extras'
+gs 'street_event','city_center', 'extras'
 
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
@@ -73,15 +73,16 @@ if shantpopala > 0:
 	rape += 1
 	shantpopala -= 1
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/sex/rape.jpg"></center>'
-	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react and run away, they grab you and drag you into the car.'
-	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding one of the pictures to your face you''ve made a while back and sent someone over a social network, hoping they would pay the ransom.'
-	'"No... what? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
-	'"Don''t lie to us, you stupid bitch." as he says that, he hits you on your head, and you pass out.'
-	'You wake up somewhere out of town, tied up and naked. You look down on yourself and notice traces of cum on your body. It also seems like that cum is flowing from your ass and pussy.'
-	'You notice that the blokes, who captured you, sit next to you and seem to have a break. Some of them are smoking.'
-	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said as he noticed you moving. Some of them are starting to get evil grins on their face.'
-	'They got up and came back at you. Barely a minute later, you wished you were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded black, and you lost consciousness again.'
-	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he yells, then kicks you in the stomach and leaves. As you collapse on the ground holding your stomach in pain, you glimpse the street and see the assholes driving away in their black jeep. The main road is about 200m away. You crawl most of the way there, but soon you can walk again, and eventually, you find your way back to one of the main streets.'
+	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react, they grab you and drag you into the car.'
+	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding up one of the pictures you took and sent someone over a social network, hoping they would pay the ransom.'
+	'"No? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
+	'"Don''t lie to us, you stupid bitch!" he snarls before he hits you on the head and you pass out.'
+	*nl
+	'You wake up somewhere, tied up and naked. You look down and notice traces of cum on your body. You can also feel cum flowing from your ass and pussy.'
+	'You notice that the men who captured you are sitting next to you having a break. Some of them are smoking.'
+	'"Oh, she''s finally awake. The next fuck-cycle will be far more fun," one of the men says when he notices you moving.'
+	'They all get up and walk towards you before having their way with you. You try to resist, but the tape hinders you from moving. Not long after, everything fades black and you lose consciousness again.'
+	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch!" he yells before kicking you in the stomach. As you hold your stomach in pain, you glimpse the men driving away in their black jeep. You crawl to the main road and find your way back to one of the main streets.'
 	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
 	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
@@ -96,75 +97,74 @@ end
 gs 'music_actions', 'music_icon'
 
 
-if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+if car > 0 and cardrive = 2:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> sits in the parking lot.'
 
 act 'Walk to the central park (0:35)': minut += 35 & gt 'city_park', 'start'
 act 'Walk to the train station (0:05)': minut += 5 & gt 'city_train', 'start'
-if hour = 4 and hour = 23:
-	act 'Walk to the Metro':  minut += 5 & gt 'metro', 'start'
+if hour >= 4 and hour < 23:
+	act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 end
 
-
-act 'Wait':gs 'obj_din', 'wait'
+act 'Wait': gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''metro'', ''start''">the metro</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
+	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 04:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St. Petersburg and the subway is great if you''re tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a 35 minute walk from here and provides a more scenic route to the other city districts.'
 *nl
-if hour >= 8 and hour <= 22:
+if hour >= 8 and hour < 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at 8:00''">kiosk</a>'
+	$desc_txt1 = '<a href="exec:msg ''The Ruch kiosk is closed and will reopen at 08:00''">kiosk</a>'
 end
-'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open 8-10 selling magazines and cigarettes for cheap.'
+'The neon green sign of a <<$desc_txt1>> catches your eye. It''s open between 08:00 and 22:00 and sells cheap magazines and cigarettes.'
 *nl
 if hour = 8 and minut >= 30:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''torgcentr''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
 elseif hour >= 9 and hour <= 20:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''torgcentr''">The Galeria mall</a>'
 	$desc_txt2 = '<a href="exec:gt ''fit'', ''start''">Havana Fitness Center</a>'
 else
 	$desc_txt1 = '<a href="exec:msg ''The Galeria mall is closed and will reopen at 8:30''">The Galeria mall</a>'
-	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
+	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 09:00''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'
 if hour >= 6 and hour <= 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''foto'', ''start''">Aphrodite Photography</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 6:00''">Aphrodite Photography</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 06:00''">Aphrodite Photography</a>'
 end
 if hour >= 6 and hour <= 23:
 	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Diner Bystroeshka</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 6:00''">Diner Bystroeshka</a>'
+	$desc_txt2 = '<a href="exec:msg ''Diner Bystroeshka is closed and will reopen at 06:00''">Diner Bystroeshka</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec:gt ''restoran'', ''start''">Babel</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at 8:00''">Babel</a>'
+	$desc_txt3 = '<a href="exec:msg ''Babel is closed and will reopen at 08:00''">Babel</a>'
 end
-'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place for cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
+'A few buildings away is <<$desc_txt1>> and <<$desc_txt2>>, a place that sells cheap fast food. For a more lavish dining experience, <<$desc_txt3>> is available.'
 *nl
 if week >= 4 and (hour >= 18 or hour <= 3):
 	$desc_txt3 = '<a href="exec:gt ''city_nightclub'', ''start''">the nightclub</a>'
 else
 	$desc_txt3 = '<a href="exec:msg ''The nightclub is closed and will open from Friday to Sunday at 18:00''">The nightclub</a>'
 end
-'At night the only place open here is <<$desc_txt3>>.'
+'The only place open here at night is <<$desc_txt3>>.'
 *nl
 if (week < 6 and hour >= 8 and hour <= 16) or (week = 6 and hour >= 8 and hour <= 13):
 	$desc_txt1 = '<a href="exec:gt ''office'', ''start''">Titran-Express</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 8:00 on Monday''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00 on Monday''">Titran-Express</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 8:00''">Titran-Express</a>'
+	$desc_txt1 = '<a href="exec:msg ''Titran-Express is closed and will reopen at 08:00''">Titran-Express</a>'
 end
 'Across the street is considered the business area. The large skyscraper there serves as the base of operations for <<$desc_txt1>>, an engineering company.'
 *nl
@@ -173,40 +173,40 @@ if casting = 0:
 elseif hour >= 7 and hour <= 20:
 	$desc_txt1 = '<a href="exec:gt ''talent_agency'', ''start''">Aurora talent agency</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 7:00''">Aurora talent agency</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 07:00''">Aurora talent agency</a>'
 end
 if week < 6 and hour >= 9 and hour <= 18:
 	$desc_txt2 = '<a href="exec:gt ''bank'', ''start''">VTB bank</a>'
 elseif week < 5 and hour > 18:
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen tomorrow at 9:00''">VTB bank</a>'
+	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen tomorrow at 09:00''">VTB bank</a>'
 else
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 9:00''">VTB bank</a>'
+	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 09:00''">VTB bank</a>'
 end
 if hour >= 8 and hour <= 22:
 	$desc_txt3 = '<a href="exec: minut += 1 & gt ''agentned'', ''start''">Kirsanova Realty</a>'
 else
-	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 8:00''">Kirsanova Realty</a>'
+	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 08:00''">Kirsanova Realty</a>'
 end
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):
 	$desc_txt4 = '<a href="exec: minut += 3 & gt ''post_office'', ''start''">post office</a>'
 elseif (week = 5 or week = 6) and hour > 16:
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00 on Monday''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00 on Monday''">post office</a>'
 else
-	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00''">post office</a>'
+	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 09:00''">post office</a>'
 end
 if hour >= 8 and hour <= 18:
-	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a>'
+	$desc_txt5 = '<a href="exec: minut += 1 & gt ''city_library''">National Library of Russia</a> and <a href="exec: minut += 1 & gt ''city_hermitage'', ''start''">Hermitage Museum</a>'
 else
-	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
+	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 08:00''">National Library of Russia</a><a href="exec:msg ''The Hermitage Museum is closed and will reopen at 08:00''">Hermitage Museum</a>'
 end
-'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
+'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>>, <<$desc_txt3>> and the 5-star <a href="exec: minut += 1 & gt ''city_hotel'', ''start''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
 	$desc_txt6 = '<a href="exec: minut += 1 & gt ''sentence'',''start''">The City Courthouse</a>'
 elseif week < 5 and hour > 17:
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 7:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 07:00''">City Courthouse</a>'
 else
-	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 7:00''">City Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 07:00''">City Courthouse</a>'
 end
 $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main city police station</a>'
 'Away from the shops is both <<$desc_txt6>> and the <<$desc_txt7>>.'
@@ -215,9 +215,9 @@ $desc_txt7 = '<a href="exec: minut += 1 & gt ''police_station'',''start''">Main
 *nl
 if nichHotelReferral = 2:
 	if hour >= 4 and hour < 16:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too early for that. You should come back between 16:00 and 20:59.'
-	elseif hour < 4 or hour > 20:
-		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too late for that. You should come back between 16:00 and 20:59.'
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too early for that. You should come back between 16:00 and 21:00.'
+	elseif hour < 4 or hour > 21:
+		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid, but it''s too late for that. You should come back between 16:00 and 21:00.'
 	else
 		'You could go to the <a href="exec:gt ''nichApartment'', ''jobInterview''">apartment of a man named Nicholas</a> to apply for a job as a live-in maid.'
 	end
@@ -230,21 +230,21 @@ if Enable_tablemap = 0:
 	if izoldaQW >= 1:'Your friend <a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment.'
 	if mainQW >= 1:'<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout.'
 	if yaq = 1:'<a href="exec:gt ''yarik'', ''start''">Yaroslav</a> from the office''s apartment.'
-	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sexshop owner''s apartment.'
+	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sex shop owner''s apartment.'
 else
 	st_count=0 & $show_table=''
-	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! daystart:gs'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
-	if nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment','3'
-	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment','3'
-	if mainQW >= 1:gs'show_table','<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout','3'
-	if yaq = 1:gs'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslav''s</a> apartment','3'
-	if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peter''s</a> apartment','3'
+	if nichTanya['Relationship'] = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanya['FuckLast'] ! daystart: gs 'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
+	if nichWork = 2: gs 'show_table','<a href="exec:gt ''nichApartment''">Nicholas''s</a> apartment','3'
+	if izoldaQW >= 1: gs 'show_table','<a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment','3'
+	if mainQW >= 1: gs 'show_table','<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout','3'
+	if yaq = 1: gs 'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslav''s</a> apartment','3'
+	if peter > 0: gs 'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peter''s</a> apartment','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
-if AlexandriaQW = 3 and hour >= 6 and hour <= 23:
+if AlexandriaQW = 3 and hour >= 6 and hour < 23:
     *nl
-    act 'Call Tatiana to infiltrate the models agency': gt 'tatiana_missions','mission2B'
+    act 'Call Tatiana to infiltrate the modeling agency': gt 'tatiana_missions','mission2B'
 end
 
 if hour >= 20 or hour <= 4:

locations/city_coffee_hole.qsrc

@@ -5,7 +5,7 @@
 
 $location_type = 'public_indoors'
 
-if $args[0]= 'start':
+if $ARGS[0]= 'start':
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -13,10 +13,10 @@ if $args[0]= 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/street_sign.jpg"></center>'
 	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are 07:00 to 23:00.'
 	act 'Return to the city': gt 'city_island'
-	if hour >= 7 and hour < 23: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
+	if hour >= 7 and hour < 22: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'inner':
+if $ARGS[0]= 'inner':
 	$loc = 'city_coffee_hole'
 	$loc_arg = 'inner'
 	$menu_loc = 'city_coffee_hole'
@@ -37,7 +37,7 @@ if $args[0]= 'inner':
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
 	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
-		!!'You see <a href="exec:gt ''albina_uni'', ''coffee_hole''">Albina</a> sitting at a table with a woman who has her back turned to you.'
+		!!'You see <a href="exec:gt ''city_coffee_hole'', ''albina''">Albina</a> sitting at a table with a woman who has her back turned to you.'
 	!!end
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
 		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
@@ -149,7 +149,7 @@ if $args[0]= 'counter':
 	minut += 5
 	gs 'stat'
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
-			gt 'city_coffee_hole','anushka_work'
+		gt 'city_coffee_hole','anushka_work'
 	else 
 		temprand = rand(1,2)
 		if temprand = 1:
@@ -158,7 +158,7 @@ if $args[0]= 'counter':
 			'As you approach, the woman behind the counter looks up at you. She appears to be in her late twenties or maybe early thirties. She has dark hair with purple streaks, and her arms are covered in tattoos. "Welcome to the Coffee Hole. What can I get you?" she asks in a friendly and welcoming tone. You notice she has a familiar accent; it reminds you a little bit of Marcus'' accent.'
 			act 'Exit the cafe': gt 'city_island'
 			act 'Leave counter': gt 'city_coffee_hole', 'inner'
-			act 'Order from the menu (0:05)':gs 'food_menu'
+			act 'Order from the menu (0:05)': gs 'food_menu'
 		else
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker2.jpg"></center>'
@@ -184,15 +184,15 @@ if $args[0]= 'anushka_work':
 		if npc_rel['A144'] >= 60:
 			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. Need your holes filled with something hot and black again?" she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "You are so bad."'
-!!make sure I didn't forget a end
+
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
-				'"Hey I have been meaning to ask, which dorm are you in? Maybe I can stop by and visit some time." You ask her.'
-				'She shakes her head. "I''m not, got a apartment with the boys." She shrugs a bit about it. "Yeah it is as bad as you think, but you can stop by sometime if you want." She gives you her address.'
-			'You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'"Hey, I''ve been meaning to ask. Which dorm are you in? Maybe I can stop by and visit some time?" you ask.'
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 			if anushkaQW['photoshoot'] >= 1 and hour = 22:
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job. After talking for a bit, you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
+				'She shrugs. "And you love it. It''s why you love hanging out with me." You end up chatting about the university and her job for a while before you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
 				act 'Let''s do a photo shoot':
 					*clr & cla
 					'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
@@ -200,11 +200,11 @@ if $args[0]= 'anushka_work':
 					'You grin at her. "We should totally do a photo shoot here."'
 					'She gives you a slightly surprised look. "What? Now?"'
 					'You find her reaction amusing. "Well, we could, but I was thinking after you closed up. So what do you say?"'
-					'She bites her lower lip for a moment. "Fuck, okay, why not? Just hang around until I close up."'
+					'She bites her lower lip. "Fuck. Okay, why not? Just hang around until I close up."'
 					act 'Wait': gt 'city_coffee_hole', 'photo_shoot'
 				end
 			else
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'She shrugs. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
@@ -221,12 +221,12 @@ if $args[0]= 'anushka_work':
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole, where we can fill your holes with something hot and black, but maybe not in the way you would like..." she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "Oh my god, you''re terrible. I didn''t know you worked here."'
 			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow."'
-!!make sure I didn't forget a end
+
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
-				'"Nice, which dorm are you in? Maybe I can stop by and visit some time." You ask her.'
-				'She shakes her head. "I''m not, got a apartment with the boys." She shrugs a bit about it. "Yeah it is as bad as you think, but you can stop by sometime if you want." She gives you her address.'
-			'You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+				'"Nice. Which dorm are you in by the way? Maybe I can stop by and visit some time?" you ask.'
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
@@ -350,7 +350,7 @@ if $ARGS[0] = 'photo_shoot':
 	end
 end
 
-if $args[0]= 'lazar':
+if $ARGS[0]= 'lazar':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'lazar'
@@ -367,17 +367,17 @@ if $args[0]= 'lazar':
 		if npc_rel['A149'] >= 60:
 			lazarQW['city_invite'] = 1
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says "What''s up, hottie? You enjoying the city?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "What''s up, hottie? You enjoying the city?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 			end
 		elseif npc_rel['A149'] <= 20:
 			'You notice Lazar sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." He heads outside and walks away.'
 		else
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says "Hey, good looking. What have you been up to?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
+				'You notice Lazar sitting at a table. "Hey, good looking. What have you been up to?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
+				'You notice Lazar sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
 			end
 		end
 	end
@@ -385,7 +385,7 @@ if $args[0]= 'lazar':
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'dimka':
+if $ARGS[0]= 'dimka':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'dimka'
@@ -400,17 +400,17 @@ if $args[0]= 'dimka':
 	else
 		if npc_rel['A1'] >= 60:
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes. He is relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes and he''s relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
 			end
 		elseif npc_rel['A1'] <= 20:
-			'You notice Dimka sitting at a table. As you approach, he says "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
+			'You notice Dimka sitting at a table. He scowls as you approach. "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
 		else
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do." he says before getting up and walking away.'
+				'You notice Dimka sitting at a table. He smiles as you approach. "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do," he says before getting up and walking away.'
 			end
 		end
 	end
@@ -418,7 +418,7 @@ if $args[0]= 'dimka':
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0] = 'marcus':
+if $ARGS[0] = 'marcus':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'marcus'
@@ -434,18 +434,18 @@ if $args[0] = 'marcus':
 	else
 		if npc_rel['A146'] >= 50:
 			marcusQW['city_invite'] = 1
-			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+			'You notice Marcus sitting at a table. He smiles as you approach. "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 		elseif npc_rel['A146'] <= 20:
-			'You notice Marcus sitting at a table. As you approach, he says "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
+			'You notice Marcus sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
 		else
-			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
+			'You notice Marcus sitting at a table. "Hey <<$pcs_nickname>>, how have you been?" he asks as you approach. You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
 		end
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'kendra':
+if $ARGS[0]= 'kendra':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'kendra'
@@ -455,7 +455,7 @@ if $args[0]= 'kendra':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 	if meet_kendra = 1:
-		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you "You change your mind about serving me?"'
+		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat. "You change your mind about serving me?" she asks bluntly.'
 		act 'No':
 			*clr & cla
 			kendrano = 1
@@ -479,9 +479,9 @@ if $args[0]= 'kendra':
 		end
 	elseif kendraslave >= 1:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'As you walk over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+		'As you walk over to her, she invites you to sit down. "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
 	elseif hotcat >= 5:
-		'As you walk over to her, she invites you to sit down. You take a seat opposite her as she says. "You''re a pretty little thing. What''s your name?"'
+		'As you walk over to her, she invites you to sit down and you take a seat opposite her. "You''re a pretty little thing. What''s your name?" she asks.'
 		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says confidently.'
 		'"Oh..." you reply. She''s one of those people.'
@@ -493,9 +493,9 @@ if $args[0]= 'kendra':
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her, telling her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
-			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her and tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			end
 			act 'Call her Kendra':
 				*clr & cla
@@ -521,14 +521,14 @@ if $args[0]= 'kendra':
 		end
 	elseif npc_rel['A84'] < 40:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'You walk over to her table and stand next to it. "Hi," you smile at her as you greet her.'
+		'You walk over to her table and stand next to it. "Hi," you smile as you greet her.'
 		'She looks up at you with an annoyed look. "I don''t have time for games, and I''m tired of yours. Now get lost." She proceeds to ignore you, so you turn and leave.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave her be': gt 'city_coffee_hole', 'inner'
 end
 
-if $args[0]= 'djibril':
+if $ARGS[0]= 'djibril':
 	*clr & cla
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'djibril'
@@ -541,24 +541,28 @@ if $args[0]= 'djibril':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	if DjibrilQW['invite'] = 1:
-		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
 	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
-		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 		
 	elseif hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'
 		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people just call me <<$pcs_nickname>>."'
-		'He looks surprised for a moment. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
+		'He looks surprised for a second. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
 		'Now it''s your turn to look surprised. "Yes, how did you know that?"'
 		*nl
 		'He shakes his head with a slight laugh. "He is my uncle. They''ve told me about you. Small world, huh?"'
-		'You giggle as well. "Yeah, it really is."'
+		'You giggle. "Yeah, it really is."'
 		'You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'
 end
 
+!!if $ARGS[0] = 'albina'
+!!!!!!!!!!!!!!!!!!!!!!!!
+end
+
 --- city_coffee_hole ---------------------------------

locations/city_hermitage.qsrc

@@ -0,0 +1,165 @@
+# city_hermitage
+!Please add a blue underlined link on the St. Petersburg city centre page as below for the State Hermitage Museum
+!Please add 1 intelligence point and 5 mood points for each visit
+
+if $ARGS[0] = 'start':
+	minut += 5
+	menu_off = 1
+	gs 'stat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp1.jpg"></center>'
+	if $ARGS[1] = 'return':
+		'You return to the visitors entrance which is located in the Winter Palace.'
+		'The State Hermitage Museum is the second largest art museum in the world and was founded in 1764 by Empress Catherine the Great and has been open to the public since 1852.'
+		'The collections occupy a large complex of six historic buildings along Palace Embankment, including the Winter Palace, a former residence of Russian emperors.'
+		'Of the six buildings in the main museum complex, five, being the Winter Palace, Small Hermitage, Old Hermitage, New Hermitage, and Hermitage Theatre are open to the public.'
+	else
+		'You see in the distance The State Hermitage Museum. It''s the second largest art museum in the world and was founded in 1764 by Empress Catherine the Great and has been open to the public since 1852.'
+		'The collections occupy a large complex of six historic buildings along Palace Embankment, including the Winter Palace, a former residence of Russian emperors.'
+		'Of the six buildings in the main museum complex, five, being the Winter Palace, Small Hermitage, Old Hermitage, New Hermitage, and Hermitage Theatre are all open to the public.'
+		'You approach the visitors entrance which is located in the Winter Palace.'
+	end
+	act 'Return city centre': gt 'city_center'
+	if hour >= 8 and hour <= 17:
+		act 'View The Golden Peacock (90 mins)': gt 'city_hermitage', 'peacock'
+		act 'View Catherine The Great''s art collection (90 mins)': gt 'city_hermitage', 'art'
+		act 'View some of it''s highlights starting with the State Gala Staircase (90 mins)': gt 'city_hermitage', 'highlights'
+		act 'View the red rooms (90 mins)': gt 'city_hermitage', 'red_rooms'
+	elseif hour > 18:
+		*nl
+		'The museum is closed, you have to leave.'
+	else
+		*nl
+		'The museum is closing so it is too late to enjoy any of the collections now.'
+	end
+end
+
+
+if $ARGS[0] = 'peacock':
+	*clr & cla
+	minut += 60
+	gs 'exp_gain', 'intel', 5
+	pcs_mood += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp2.jpg"></center>'
+	'You spend some time looking at the various collections which include Egyptian and classical antiquities and various art galleries dating back to prehistoric times.'
+	'These collections include Catherine''s collection which she used to start the museum.'
+	'After a while you decide to view one of the highlights of the museum, The Golden Peacock Clock.'
+	act 'The Golden Peacock Clock':
+		*clr & cla
+		minut += 30
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp3.jpg"></center>'
+		'The Peacock Clock is a large automaton featuring three life-sized mechanical birds. It was manufactured by the entrepreneur James Cox in the 2nd half of the 18th century and was acquired by Catherine the Great in 1781. Today it is a prominent exhibit in the collections of the Hermitage museum and has been in the Hermitage since 1797 when it was moved there from the Taurida Palace.'
+		'The history of the Golden Peacock Clock begins in 1777 when the Duchess of Kingston visited St Petersburg. Grigory Potiomkin, met the Duchess in society learned about the works of James Cox and commissioned him to make a monumental automaton with a clock for the Empress''s Hermitage.'
+		'It is one of only two such automatons surviving in the world today, the other is The Silver Swan which can be viewed in the Bowes museum in Barnard Castle in the UK.'
+		'These two pieces were at the forefront of exploring what is meant by <i>life</i>, both real and artificial and are marvels of their time.'
+		'Having thoroughly enjoyed your visit you feel nice and calm and maybe you''ve learnt something today as you decide that it''s probably time to be on your way.'
+		act 'Return to visitor''s entrance': gt 'city_hermitage', 'start', 'return'
+	end
+end
+
+if $ARGS[0] = 'art':
+	*clr & cla
+	minut += 60
+	gs 'exp_gain', 'intel', 5
+	pcs_mood += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp4.jpg"></center>'
+	'You spend some time looking at the various collections which include Egyptian and classical antiquities and various art galleries dating back to prehistoric times.'
+	'These collections include Catherine''s collection which she used to start the museum.'
+	'In her lifetime, Catherine acquired around 4,000 paintings from the old masters, 38,000 books, 10,000 engraved gems, 10,000 drawings, 16,000 coins and medals, and a natural history collection filling two galleries so viewing it all would take several days!'
+	'After a while you decide to view the art collection which she started in 1764. After all, it was due to her acquiring this art collection from Johann Gotzkowsky that she commissioned the museum.'
+	act 'Catherine The Great''s collection':
+		*clr & cla
+		minut += 30
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp5.jpg"></center>'
+		'Catherine the Great started her art collection in 1764 by purchasing in excess of 200 paintings which were originally assembled collection for Frederick II of Prussia, however, he refused to complete the purchase.'
+		'The collection consisted mainly of Dutch or Flemish pieces and included 13 by Rembrandt and 11 by Rubens plus a number of other well known and renowned artists.'
+		'Perhaps some of the most famous and notable artworks that were a part of Catherine''s original purchase from Gotzkowsky were Danaë, painted by Rembrandt in 1636; Descent from the Cross, painted by Rembrandt in 1624; and Portrait of a Young Man Holding a Glove, painted by Frans Hals in 1650. These paintings remain in the Hermitage collection today.'
+		'Having thoroughly enjoyed your visit you feel nice and calm and maybe you''ve learnt something today as you decide that it''s probably time to be on your way.'
+		act 'Return to visitor''s entrance': gt 'city_hermitage', 'start', 'return'
+	end
+end
+
+if $ARGS[0] = 'highlights':
+	*clr & cla
+	minut += 30
+	gs 'exp_gain', 'intel', 5
+	pcs_mood += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp6.jpg"></center>'
+	'You spend some time looking at the various collections which include Egyptian and classical antiquities and various art galleries dating back to prehistoric times.'
+	'However, on this visit you decide to concentrate on a few of the museum''s highlights so pass through the various exhibitions quickly and head to the State Gala Staircase.'
+	'It''s probably the most extravagant and grandiose place at the whole museum!'
+	'There are many beautiful halls at the museum, but this stands out because it’s a staircase and not a hall.'
+	'As you stand in the baroque hall and look up at the staircase with a red velvet carpet and decorated with huge mirrors, ceiling paintings, sweeping balustrades of marble and gold for just a moment it makes you feel like you''ve been invited to a pompous ball. Oh well... Maybe not this time!'
+	act 'The Pavilion Hall':
+		*clr & cla
+		minut += 30
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp7.jpg"></center>'
+		'You decide to move on and take in the grandeur of the Pavilion Hall.'
+		'It''s really impressive and maybe the finest room in the palace. The hall is illuminated by twenty-eight large and small crystal chandeliers and it’s embellished with Renaissance, Gothic and Oriental motifs.'
+		act 'The Raphael Loggias':
+			*clr & cla
+			minut += 30
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp8.jpg"></center>'
+			'Catherine the Great admired the Papal Palace in Vatican City, painted by Raphael in the 15th century.'
+			'She wanted her own copy so much so that she commissioned a reproduction in the late 1780s.'
+			'Architect Giacomo Quarenghi made this loggia, after which it was accented with Biblical stories and bas-reliefs.'
+			'Having thoroughly enjoyed your visit you feel nice and calm and maybe you''ve learnt something today as you decide that it''s probably time to be on your way.'
+			act 'Return to visitor''s entrance': gt 'city_hermitage', 'start', 'return'
+		end
+	end
+end
+
+if $ARGS[0] = 'red_rooms':
+	*clr & cla
+	minut += 20
+	gs 'exp_gain', 'intel', 3
+	pcs_mood += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp9.jpg"></center>'
+	'Among the Hermitage Museum highlights are the red rooms which contain Italian art.'
+	'This area has a majestic ambience from the beautiful St. George’s hall and displays 17th and 18th century Italian paintings.'
+	'It also includes the war gallery of 1812 celebrating the Russian victory at the gates of Moscow turning back Napoleon''s invasion of Russia.'
+	act 'Enter the museum''s skylight rooms':
+		*clr & cla
+		minut += 10
+		gs 'exp_gain', 'intel', 2
+		pcs_mood += 5
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp10.jpg"></center>'
+		'The Large Italian Skylight Hall of the State Hermitage Museum is the biggest of the three splendid skylight rooms of the New Hermitage and was constructed to the design of Leo von Klenze for the Imperial Museum in the mid 19th century.'
+		'These halls are intended to show large-scale paintings and owe their names to the vaulted ceilings with glass skylight windows.'
+		'The high vaults of the Large Skylight Hall are embellished with impressive stucco ornaments. A stucco frieze decorates the upper parts of the walls.'
+		'The furniture on display was also made according to drawings by Leo von Klenze.'
+		'The room is adorned with items made by 19th-century Russian craftsmen from coloured stones.'
+		act 'The Ancient Hall':
+			*clr & cla
+			minut += 30
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp11.jpg"></center>'
+			'You now fancy stepping way back in time so head off to the first floor of the Old Hermitage.'
+			'This is where you find the ancient hall and Antiquities Collection, which is different from the rest of the Hermitage collection.'
+			'The area covers 31 halls which include an extensive collection, including Assyrian, Mesopotamian, and Egyptian artefacts, as well as Greek and Roman art work.'
+			act 'Walk around the outside of the museum':
+				*clr & cla
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hermitage/gp12.jpg"></center>'
+				'At the Hermitage it’s so easy to get lost in the thousands of paintings and numerous art collections inside so on this visit you decide to wander around the outside for a bit and admire the beautiful architecture.'
+				'As you walk around the museum''s exterior you ensure you have time to take in the building’s green and white façade facing the Palace Square.'
+				'Having thoroughly enjoyed your visit you feel nice and calm and maybe you''ve learnt something today as you decide that it''s probably time to be on your way.'
+				act 'Return to visitor''s entrance': gt 'city_hermitage', 'start', 'return'
+			end
+		end
+	end
+end
+
+
+--- city_hermitage ---------------------------------
+

locations/city_industrial.qsrc

@@ -3,21 +3,18 @@
 ! 14-09-22 Added Metro link to navigation line 49
 
 if $ARGS[0] = '':
-	$loc_arg = ''
-	$loc = 'city_industrial'
+	gs 'shortgs', 'setloc', 'city_industrial', $ARGS[0]
 	$region = 'city'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'city_industrial'
-	$menu_arg = ''
 	menu_off = 0
 	CLOSE ALL
 	if sound = 0:
-		if month >=11 and month <= 12 or month >=1 and month <=3:
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3', 30
 		else
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 		end
 	end
 
@@ -42,13 +39,13 @@ if $ARGS[0] = '':
 		end
 	end
 
-	gs'street_event','city_industrial', 'extras'
+	gs 'street_event','city_industrial', 'extras'
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
 	act 'Walk to the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
 	act 'Walk to the central park (1:00)': minut += 60 & gt 'city_park', 'start'
 	act 'Walk to the industrial train station (0:15)': minut += 15 & gt 'city_industrial_train', 'outside'
-	if hour >= 4 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 	end
 	if evt_chk = 1:
@@ -66,7 +63,7 @@ if $ARGS[0] = '':
 			cardrive = 3
 		end
 		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
-			'In the parking stands your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+			'Your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a> stands in the parking lot.'
 		end
 	end
 
@@ -81,19 +78,19 @@ if $ARGS[0] = '':
 	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''city_industrial_train'', ''outside''">train station</a>.'
 
 	if week = 3 or hour < 16:
-		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight...'
+		'The "Rabotnik" bar is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and midnight.'
 	else
 		'The <a href="exec: minut += 5 & gt ''qwBarPolet''">Bar "Rabotnik"</a> seems to be open.'
 	end
 	![slavaQW - Related to Glory; references to bar "Flight" have to be fixed - requirement to access the bar has been removed for now, since content not related - Variable not used by anything else at the moment]
 
 	litltown = 0
-	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">gas station</a> near the street'
+	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">gas station</a> near the street.'
 
-	if hour >= 5 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		'The <a href="exec: minut += 5 & gt ''metro'', ''start''">metro station</a> is within a 5 minute walk from here.'
 	else
-		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
+		'The metro station is within a 5 minute walk from here, but it''s closed until 04:00.'
 	end
 	if func('autotraidF', 'is_open'):
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
@@ -129,7 +126,7 @@ if $ARGS[0] = '':
 	if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'
 
 	if age => 18:
-        'There is a huge building, with bright lights, which houses a <a href="exec: minut += 10 & gt ''casino'', ''outside''">Casino</a>.'
+        'A huge building covered in bright lights houses a <a href="exec: minut += 10 & gt ''casino'', ''outside''">casino</a>.'
     end
 
 	if hour >= 14 or hour < 4:
@@ -137,10 +134,10 @@ if $ARGS[0] = '':
 	else
 		'Located far away from the buildings is a barbecue. It''ll be open between 14:00 and 04:00'
 	end
-	if jouryResult = 10:'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri''s</a> flat'
-	if BurgerQW['IlyQWTatianaHelp'] > 0:'In one of these building is <a href="exec:gt ''ilyroom''">Manager Ilyushkins</a> apartment'
+	if jouryResult = 10: 'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri</a>.'
+	if BurgerQW['IlyQWTatianaHelp'] > 0:'In one of these buildings is <a href="exec:gt ''ilyroom''">Ilyushkin''s</a> apartment.'
 
-	'A long and high fence, which is build around the <a href="exec:gt ''Terminal''">storage terminal</a>'
+	'A long and high fence is built around the <a href="exec:gt ''Terminal''">storage terminal</a>.'
 end
 
 

locations/city_island.qsrc

@@ -11,12 +11,12 @@ $menu_arg = ''
 menu_off = 0
 close all
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >=11 and month <= 12 or month >= 1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3',30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_noise_siren.mp3', 30 & PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 clr
@@ -37,7 +37,7 @@ else
 	end
 end
 
-'The University area of the city, the University, shops, clubs and the like that cater to the college kids dominate this area of the city. There is only three bridges onto and off the island, plus the metro line.'
+'The university and shops and clubs that cater to the students dominate this area of the city.'
 
 !call random events from [street_events], and display them before show location.
 if streetevent_hour + 2 < hour:gt'street_event','city_island', 'main'
@@ -46,9 +46,9 @@ gs 'street_event', 'city_island', 'extras'
 
 if func('homes_properties', 'has_access', 'university_dorm') :act '<b>GO HOME</b> (University dorm)':gt 'uni_dorm', 'start'
 
-if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+if car > 0 and cardrive = 25:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands in the parking lot.'
 
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': gt 'metro', 'start'
 end
 
@@ -61,20 +61,20 @@ if hour >= 8 and hour <= 22:
 	'The <a href="exec: minut += 3 & gt ''uni_shop'', ''start''">supermarket</a> is not far from here.'
 	'You can see the <a href="exec:$loc = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 else
-	'The local convenience store is closed, they open again at 8:00'
-	'You can see a closed kiosk. It''s open between 08:00 - 23:00.'
+	'The local convenience store is closed. It will reopen at 08:00'
+	'You can see a closed kiosk. It''s open between 08:00 and 23:00.'
 end
 if hour >= 8 and hour < 22:
-	'You can see <a href="exec:gt ''shop_dolls'', ''start''">Patch Work Dolls</a> a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. Next to <a href="exec:gt ''shop_nerdvana'', ''start''">Nerdvana</a> a clothing store for everything a nerd could desire.'
+	'You can see <a href="exec:gt ''shop_dolls'', ''start''">Patch Work Dolls</a>, a clothing store that caters to Alternative styles, like gothic, punk and skater. Next door is <a href="exec:gt ''shop_nerdvana'', ''start''">Nerdvana</a>, a clothing store that stock everything a nerd could desire.'
 else
-	'You can see Patch Work Dolls a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. Next to that is Nerdvana the nerd clothing store, they both open every day between 08:00 - 22:00'
+	'You can see Patch Work Dolls, a clothing store that caters to Alternative styles, like gothic, punk, skater. Next door is Nerdvana, the nerd clothing store. They both open every day between 08:00 and 22:00'
 end
-if hour >= 7 and hour <= 23:
-	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks from the University.'
+if hour >= 7 and hour < 22:
+	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks away from the university.'
 else
-	'The The Coffee Hole, coffee shop is closed, they open again at 7:00'
+	'The Coffee Hole is closed. They reopen at 07:00.'
 end
-if hour >= 4:
+if hour >= 4 and hour < 23:
 	'The <a href="exec:minut += 1 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 else
 	'The Metro Station is closed. The first train will depart at 04:00.'
@@ -83,7 +83,7 @@ if anushkaCityQW['first_visit'] > 0:
 	'Anushka lives in <a href="exec:minut += 1 & gt ''anushapt_city'', ''home''">a shared apartment</a> around the corner.'
 end
 
-act 'Go to the University campus': 
+act 'Go to the university campus': 
 	minut += 1
 	gt 'uni_grounds', 'main'
 end
@@ -96,8 +96,8 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
 	mainQW = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-	'In front of your dorm, you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
-	'Tatiana looks at you closely, "I felt a burst of energy. Were you attacked by a magician?"'
+	'You see Tatiana and Gustav standing in front of your dorm. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
+	'Tatiana looks at you closely. "I felt a burst of energy. Were you attacked by a magician?"'
 	act 'No':gt 'mainQW'
 	exit
 end

locations/city_lake.qsrc

@@ -105,22 +105,25 @@ if $ARGS[0] = 'start':
 				end
 			end
 
-			act 'Go for a swim':
-				*clr & cla
-				menu_off = 1
-				pcs_makeup = 1
-				cumspclnt = 4
-				gs 'cum_cleanup'
-				gs 'exercise', 'tier1', 60, 'stren'
-				pcs_sweat = 10 + rand(0,4)
-				if pcs_inhib < 40:inhib_exp += rand(1,2)
-
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
-				'You swim in the lake for an hour. The water refreshes and invigorates you.'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-
-				act 'Get out of the water':gt 'city_lake', 'start'
+			if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+				act 'Go for a swim':
+					*clr & cla
+					menu_off = 1
+					pcs_makeup = 1
+					cumspclnt = 4
+					gs 'cum_cleanup'
+					gs 'exercise', 'tier1', 60, 'stren'
+					pcs_sweat = 10 + rand(0,4)
+					if pcs_inhib < 40:inhib_exp += rand(1,2)
+
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
+					'You swim in the lake for an hour. The water refreshes and invigorates you.'
+					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+
+					act 'Get out of the water':gt 'city_lake', 'start'
+				end
 			end
+
 			if sunWeather = 1:
 				act 'Sunbathe':
 					*clr & cla

locations/city_mansion_residence_3.qsrc

@@ -51,40 +51,40 @@ if $ARGS[0] = 'ypool':
 	act 'Go back inside': minut += 1 & gt 'city_mansion_residence_1', 'yfoyer'
 	act 'Go into your gym': gt 'city_mansion_residence_3', 'ygym'
 	act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
-	act 'Swim (1:00)':
-		menu_off = 1
-		pcs_makeup = 1
-		cumspclnt = 10
-		gs 'cum_cleanup'
-		minut += 60
-		pcs_mood += 50
-		if pcs_sweat > 10:pcs_sweat = 10 + rand(0,4)
-		if pcs_stren < 40:gs 'exp_gain', 'stren', 2
-		fat -= 1
-		gs 'stat'
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Swim (1:00)':
+			menu_off = 1
+			pcs_makeup = 1
+			cumspclnt = 10
+			gs 'cum_cleanup'
+			gs 'exercise', 'tier1', 60, 'stren'
+			pcs_mood += 50
+			if pcs_sweat > 10:pcs_sweat = 10 + rand(0,4)
+			gs 'stat'
 
-		*clr & cla
-		if func('body_din','pregnancyVisibility') = 0:
-			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_<<rand(1,10)>>.jpg"></center>'
-				inhib_exp += rand(2,4)
-			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
-				if pcs_inhib < 50: inhib_exp += rand(2,4)
-			end
-		else
-			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_preg_<<rand(1,2)>>.jpg"></center>'
-				inhib_exp += rand(2,4)
+			*clr & cla
+			if func('body_din','pregnancyVisibility') = 0:
+				if $clothingworntype = 'nude':
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_<<rand(1,10)>>.jpg"></center>'
+					inhib_exp += rand(2,4)
+				else
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_<<rand(1,8)>>.jpg"></center>'
+					if pcs_inhib < 50: inhib_exp += rand(2,4)
+				end
 			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
-				if pcs_inhib < 50: inhib_exp += rand(2,4)
+				if $clothingworntype = 'nude':
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_preg_<<rand(1,2)>>.jpg"></center>'
+					inhib_exp += rand(2,4)
+				else
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+					if pcs_inhib < 50: inhib_exp += rand(2,4)
+				end
 			end
-		end
-		'You swim in your pool. The water refreshes and invigorates you.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+			'You swim in your pool. The water refreshes and invigorates you.'
+			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-		act 'Get out of the water':gt 'city_mansion_residence_3', 'ypool'
+			act 'Get out of the water':gt 'city_mansion_residence_3', 'ypool'
+		end
 	end
 end
 

locations/city_redlight.qsrc

@@ -12,11 +12,11 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	if sound = 0:
 		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3', 30 & PLAY 'sound/zima.mp3',30
 		else
-			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 		end
 	end
 
@@ -25,7 +25,7 @@ if $ARGS[0] = 'start':
 	'<center><b>Red Light District</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 	
-	'This small area inside the Industrial District is home to a number of strip clubs and sex shops. The porn studio also operates out of this district.'
+	'This small area inside the Industrial District is home to a number of strip clubs and sex shops.'
 	if hour >= 18 or hour < 3:
 		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Fuzzy Dice</a> strip club attract men from all over the city.'
 	else
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 	else
 		'A seedy looking shop that sells sex toys and other erotic merchandise. It is currently closed and will reopen at 11:00.'
 	end
-	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
+	if bordel > 0 and func('bordel', 'is_open'): 'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 	if hour >= 10: 
 		'You see a small <a href="exec:gt ''city_redlight'',''city_copy_shop''">printing shop</a> tucked away between two larger buildings.'
 	else
@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 	
 	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
-	act 'Wait':gs 'obj_din', 'wait'
+	act 'Wait': gs 'obj_din', 'wait'
 	
 	gs 'taxi'
 

locations/city_residential.qsrc

@@ -4,22 +4,19 @@
 
 music_loop = 0
 CLOSE ALL
-$loc_arg = ''
-$loc = 'city_residential'
-$region = 'city'
+gs 'shortgs', 'setloc', 'city_residential', $ARGS[0]
 $location_type = 'public_outdoors'
-$menu_loc = 'city_residential'
-$menu_arg = ''
+$region = 'city'
 menu_off = 0
 killvar '$locclass'
 
 if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	if month >= 11 and month <= 12 or month > =1 and month <= 3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/zima.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3', 30
 	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3', 30 & PLAY 'sound/street7.mp3', 30 & PLAY 'sound/street_leto.mp3', 30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3', 30
 	end
 end
 
@@ -42,7 +39,7 @@ else
 	end
 end
 
-gs'street_event','city_residential', 'extras'
+gs 'street_event','city_residential', 'extras'
 
 if opusk > 0 or gnewQW = 5:
 	if rand(0,9) = 0:gt 'gopnew', 'start5'
@@ -87,7 +84,7 @@ if func('homes_properties', 'has_access', 'city_apartment'):
 		gt 'korr'
 	end
 end
-if hour >= 4 and hour <= 23:
+if hour >= 4 and hour < 23:
 	act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 end
 
@@ -110,28 +107,28 @@ if Enable_tablemap = 0:
 	if klofQW >= 2:'<a href="exec:gt ''city_jorahouse'', ''start''">Jora''s</a> apartment'
 else
 	st_count=0 & $show_table=''
-	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kat''s</a> apartment','3'
-	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irene''s</a> apartment is not far from yours.','3'
-	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''city_dima'', ''start''">Dima''s</a> apartment','3'
-	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Jora''s</a> apartment','3'
+	if katkey = 1: gs 'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kat''s</a> apartment','3'
+	if IrinaQW >= 1: gs 'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irene''s</a> apartment is not far from yours.','3'
+	if hour >= 16 and hour < 22 and dimaQW > 0: gs 'show_table','<a href="exec:gt ''city_dima'', ''start''">Dima''s</a> apartment','3'
+	if klofQW >= 2: gs 'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Jora''s</a> apartment','3'
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
-		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovna''s</a> apartment.', '3'
+		gs 'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovna''s</a> apartment.', '3'
 	elseif lesbiday ! daystart and subdom = 2:
-		gs'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.','3'
+		gs 'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
-		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''s</a> apartment.','3'
+		gs 'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''s</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 13:
-		gs'show_table','<a href="exec:gt ''lesbimistress'', ''start''">Mistress''s</a> apartment.','3'
+		gs 'show_table','<a href="exec:gt ''lesbimistress'', ''start''">Mistress''s</a> apartment.','3'
 	end
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
-if hour >= 5 and hour <= 23:'The <a href="exec: minut += 1 & gt ''metro'', ''start''">Metro</a> station is a 5 minute walk away.'
+if hour >= 4 and hour < 23:'The <a href="exec: minut += 1 & gt ''metro'', ''start''">Metro</a> station is a 5 minute walk away.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
 if (hour >= 8 and hour <= 20) or preg = 2:
 	'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
 else
-	'The clinic is close. It will open at 08:00.'
+	'The clinic is closed. It will open at 08:00.'
 end
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:
 	'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
@@ -161,7 +158,7 @@ if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building wh
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is a 20 minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is a 40 minute walk away.'
-'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">Pharmacy</a>.'
+'A 24 hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">pharmacy</a> is located nearby.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:

locations/city_suburbs.qsrc

@@ -15,20 +15,20 @@ if $ARGS[0]='start':
 
 	if car > 0 and cardrive = 28:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> stands on the street.'
 
-    if hour >= 4 and hour <= 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minute walk from here.'
+    if hour >= 4 and hour < 23:'The <a href="exec: minut += 20 & gt ''metro'', ''start''">Metro</a> station is a 20 minute walk from here.'
 
 	gs 'taxi'
 
 	if AlexandriaQW > 6:
-		if hour > 7 and hour < 20:'You can visit <a href="exec: minut += 5 & gt ''AlexandriaHome'', ''intercom''">Aleksei''s home</a> if you want to see the cranky wizard.'
+		if hour > 7 and hour < 20: 'You can visit <a href="exec: minut += 5 & gt ''AlexandriaHome'', ''intercom''">Aleksei''s home</a> if you want to see the cranky wizard.'
 	end
 
 	if BDSMClub = 1 or BDSMmeet > 0:
-		act 'BDSM-club':gt'BDSM_Club','start'
+		act 'Go to the BDSM club': gt 'BDSM_Club','start'
 	end
 	
 	if func('homes_properties', 'has_access', 'matryona_mansion') = 0:
-		'There is a vacant piece of land for sale where a large mansion could be constructed.'
+		'There is a vacant plot of land for sale where a large mansion could be constructed.'
 		act 'Visit the land for sale': minut += 10 & gt 'city_mansion_entrance'
 	elseif func('homes_properties', 'is_property_of_status', 'owned', 'matryona_mansion'):
 		constructionstatus = func('homes_properties', 'get_property_construction_status', 'matryona_mansion')
@@ -37,7 +37,7 @@ if $ARGS[0]='start':
 		elseif constructionstatus = 1:
 			'You mansion is partially built near here.'
 		else
-			'Your mansion is not too far from her'
+			'Your mansion is not too far from here.'
 		end
 		act 'Visit your mansion': minut += 10 & gt 'city_mansion_entrance'
 	else
@@ -48,26 +48,25 @@ if $ARGS[0]='start':
 	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
 	act 'Walk to the main road':nroad = 1 & minut += 15 & gt 'road'
-	if hour >= 4 and hour <= 23:
+	if hour >= 4 and hour < 23:
 		act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 	end
 
 	if AlexandriaQW = 6:
 		gs 'willpower', 'misc', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Look for Alexandria''s direction (<<will_cost>> Willpower)':
+			act 'Look for Alexandria (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'easy'
-				gt'alexandriaEv','interview1'
+				gt 'alexandriaEv','interview1'
 			end
 		else
-			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Look for Alexandria (<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]='ps1':
-	cla
-	*clr
+	*clr & cla
 	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps1'
 	menu_off = 0
@@ -77,12 +76,11 @@ if $ARGS[0]='ps1':
 	if psiklik = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum0.jpg" ></center>'
 	if psiklik = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum1.jpg" ></center>'
 
-	act 'Go': minut += 2 & gt'city_suburbs','start'
+	act 'Leave': minut += 2 & gt'city_suburbs','start'
 end
 
 if $ARGS[0]='ps2':
-	cla
-	*clr
+	*clr & cla
 	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps2'
 	menu_off = 0
@@ -91,7 +89,7 @@ if $ARGS[0]='ps2':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/abandoned.jpg" ></center>'
 	'An abandoned building that spoils the local communities appearance and intimidates local residents.'
 
-	act 'Go': minut += 2 & gt'city_suburbs','start'
+	act 'Leave': minut += 2 & gt'city_suburbs','start'
 end
 
 --- city_suburbs ---------------------------------

locations/emp_functions.qsrc

@@ -191,11 +191,11 @@ if $ARGS[0] = 'disp_evt':
 		'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: ' + func('agentned', 'format_price_string', 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')
-		'Location reminder: ' + $transient_mc_locat
+		'Location: ' + $transient_journal
 		'Job Details: ' + $transient_desc
 		
 		act 'Accept the job' : gs 'emp_functions', 'cat_evt'
@@ -207,29 +207,30 @@ if $ARGS[0] = 'disp_evt':
 
 	!! create table for all jobs:
 	if ARGS[1] = 2:	
-		if evt_event[0] ! '':			
+		if arrsize('evt_event') > 0:			
 			killvar '$evtbody'
-			job_idx = 0		
+			job_idx = 0				
 			*nl
 			:jmp_list_create
-				!!if evt_silent[job_idx] = 1:
+				if evt_silent[job_idx] = 1:
+					gs 'emp_functions','evt_day_suffix',evt_day[job_idx]
 					$evtbody += '<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>' 
 					$evtbody += '<td>' + func('agentned', 'format_price_string', 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>'
-					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $evt_mc_locat[job_idx] + '</td>'
+					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $evt_journal[job_idx] + '</td>'
 					$evtbody += '<td><a  href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
-				!!end
+				end
 				job_idx += 1
-				if job_idx < arrsize('evt_event') : jump 'jmp_list_create'
-				!!if evt_silent[job_idx] = 1: 
-					'<center><h2>Current Task List</h2></center>'		
-					$evtheader = '<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><<$evtheader>><<$evtbody>></tr></table></center>'
-				!!end
+				if job_idx < arrsize('evt_event') : jump 'jmp_list_create' 
+			if $evtbody ! '': 
+				'<center><h2>Current Task List</h2></center>'		
+				$evtheader = '<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><<$evtheader>><<$evtbody>></tr></table></center>'
 				killvar '$evtbody'
 				killvar '$evtheader'
 			else
 				'You haven''t taken on any jobs yet.'
 			end
+		end
 	end
 	
 	!! Display the location acts
@@ -249,7 +250,9 @@ if $ARGS[0] = 'disp_evt':
 		if ((evt_hour[act_idx] = hour and evt_minutes[act_idx] <= minut) or evt_hour[act_idx] = (hour - 1)) and $loc = $evt_loc[act_idx]:
 			act 'Attend your ' + $evt_job[evt_event[act_idx]] + ' event':
 				gs 'emp_functions', 'array_init'
-				if $evt_trigger_exec ! '':
+				if evt_event = 1:
+					gt 'photography_work', 'evt_stage'
+				elseif $evt_trigger_exec ! '':
 					gt $evt_trigger_exec[act_idx], $evt_trigger[act_idx]
 				else
 					gt $evt_loc[act_idx], $evt_loc_arg[act_idx]
@@ -294,8 +297,9 @@ if $ARGS[0] = 'gen_evt':
 	transient_evt_minutes = rand(0, 9)
 	
 	!! Set as multiples of 60 	
-	transient_evt_duration = rand(1,8)
-	
+	if transient_evt_duration = '':
+		transient_evt_duration = rand(1,8)
+	end
 	!! logic check for when randomising event duration
 	
 	if transient_evt_duration + transient_evt_hour >= 22:
@@ -362,10 +366,10 @@ if $ARGS[0] = 'cat_evt':
 	!! Create global variables for the current live event.
 	!! Use 0 to create hidden events, 1 to show in journal
 	evt_silent[] = transient_evt_silent
-	!! Event type used in Journal
-	evt_event[] = transient_evt_type
-	!! Additional ID if required 
-	evt_event_sub[] = transient_evt_sub_type 
+	!! Event job descriptor used in Journal
+	evt_event[] = transient_evt
+	!! Additional job ID if required 
+	evt_event_sub[] = transient_evt_sub
 	!! Day of Week used in Journal and content areas
 	evt_dow[] = transient_evt_dow
 	!! Event Date to check against current date & used in Journal and content areas
@@ -383,7 +387,7 @@ if $ARGS[0] = 'cat_evt':
 	!! How much wages, generated or manual using function
 	evt_wages[] = transient_evt_wages
 	!! Journal location as reminder
-	$evt_mc_locat[] = $transient_mc_locat
+	$evt_journal[] = $transient_journal
 	!! The following are event location triggers to allow the content to appear in areas such as community centre but host their content elsewhere such as Photography shop
 	!! 	Event area triggers such as city_residential
 	$evt_loc[] = $transient_loc
@@ -473,24 +477,37 @@ if $ARGS[0] = 'evt_day_suffix':
 	else
 		query_day = transient_evt_day
 	end
-	if query_day => 20 and query_day <= 29:
+	if query_day => 20 and query_day < 30:
 		test_day = query_day - 20
 	else
 		test_day = query_day
 	end
-
-	if (test_day => 4 and test_day <= 10) or (day => 4 and day <=10):
-		$evt_suffix = 'th'
-	elseif (test_day = 1 or test_day = 31) or (day = 1 or day = 21 or day = 31):
-		$evt_suffix = 'st'
-	elseif (test_day = 2) or (day = 2 or day = 22):
-		$evt_suffix = 'nd'    
+	if transient_evt_day ! '':
+		if test_day => 4 and test_day <= 10:
+			$evt_suffix = 'th'
+		elseif test_day = 1 or test_day = 31:
+			$evt_suffix = 'st'
+		elseif test_day = 2:
+			$evt_suffix = 'nd'    
+		elseif test_day= 3: 
+			$evt_suffix = 'rd'
+		else
+			$evt_suffix = 'th'
+		end
+	end
+	if day => 4 and day <=10:
+		$date_suffix = 'th'
+	elseif day = 1 or day = 21 or day = 31:
+		$date_suffix = 'st'
+	elseif day = 2 or day = 22:
+		$date_suffix = 'nd'    
 	elseif test_day= 3: 
-		$evt_suffix = 'rd'
+		$date_suffix = 'rd'
 	else
-		$evt_suffix = 'th'
+		$date_suffix = 'th'
 	end
 
+
 	killvar 'test_day'
 	killvar 'query_day'
 end

locations/etoexhib.qsrc

@@ -534,43 +534,43 @@ if $ARGS[0] = 'pos16':
 	'<center><b><font color="maroon">Lake</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/suburban/lake.jpg"></center>'
 
-	if temper >= 20 and bikini > 0 and hour >= 6 and hour <= 20:
-		act 'Swim with a swimsuit (1 hour)':
-			cla
-			*clr
-			cumspclnt = 4
-			gs 'cum_cleanup'
-			inhib_exp += rand(1,2)
-			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren'
-			pcs_sweat = 10 + rand(0,4)
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		if temper >= 20 and bikini > 0 and hour >= 6 and hour <= 20:
+			act 'Swim with a swimsuit (1 hour)':
+				cla
+				*clr
+				cumspclnt = 4
+				gs 'cum_cleanup'
+				inhib_exp += rand(1,2)
+				gs 'exercise', 'tier1', 60, 'stren'
+				pcs_sweat = 10 + rand(0,4)
 
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
-			'You swim in the lake, the water refreshes and invigorates you.'
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
+				'You swim in the lake, the water refreshes and invigorates you.'
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Get out of the water':gt 'etoexhib', 'pos16'
+				act 'Get out of the water':gt 'etoexhib', 'pos16'
+			end
 		end
-	end
 
-	if temper >= 20 and hour >= 6 and hour <= 20:
-		act 'Swim naked (1 hour)':
-			cla
-			*clr
-			cumspclnt = 4
-			gs 'cum_cleanup'
-			inhib_exp += 3
-			minut += 60
-			gs 'exercise', 'tier1', 1, 'stren'
-			pcs_sweat = 10 + rand(0,4)
-			gs 'arousal', 'foreplay', 60, 'exhibition'
-			gs 'arousal', 'end'
-
-			'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
-			'You swim in the lake completely naked, the water refreshes and invigorates you.'
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-
-			act 'Get out of the water':gt 'etoexhib', 'pos16'
+		if temper >= 20 and hour >= 6 and hour <= 20:
+			act 'Swim naked (1 hour)':
+				cla
+				*clr
+				cumspclnt = 4
+				gs 'cum_cleanup'
+				inhib_exp += 3
+				gs 'exercise', 'tier1', 60, 'stren'
+				pcs_sweat = 10 + rand(0,4)
+				gs 'arousal', 'foreplay', 60, 'exhibition'
+				gs 'arousal', 'end'
+
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
+				'You swim in the lake completely naked, the water refreshes and invigorates you.'
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+
+				act 'Get out of the water':gt 'etoexhib', 'pos16'
+			end
 		end
 	end
 

locations/exercise.qsrc

@@ -349,7 +349,7 @@ if $ARGS[0] = 'butt':
 	timemult = 0
 
 	if $clothingworntype ! 'nude':
-		'<center><img <<$set_imgh>> src="images/pc/activities/excercises/butt_home_dressed.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/butt_home_dressed.jpg"></center>'
 	elseif $pantyworntype ! 'none':
 		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/butt_home_underwear.jpg"></center>'
 	else
@@ -707,12 +707,12 @@ end
 
 if $ARGS[0] = 'get_sport_clothes_exercise_bonus':
 	sport_clothes_exercise_bonus = 0
-	if $braworntype = 'sport':
+	if $braworntype = 'sport' or $braworntype = 'danilovich':
 		sport_clothes_exercise_bonus += 1
 	elseif PCloBra = 1 and $clothingworntype = 'danilovich_outfits':
 		sport_clothes_exercise_bonus += 1
 	end
-	if $pantyworntype = 'sport':
+	if $pantyworntype = 'sport' or $pantyworntype = 'danilovich':
 		sport_clothes_exercise_bonus += 1
 	elseif PCLoPanties = 1 and $clothingworntype = 'danilovich_outfits':
 		sport_clothes_exercise_bonus += 1

locations/exhibitionistshop.qsrc

@@ -214,18 +214,33 @@ if $ARGS[0] = 'panties':
 	cls
 	gs'stat'
 
+	gs 'panties', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'exhibitionistshop', 'start'
 	end
 
-	i = 2
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
 
-	:loopsalacious_panties
-		if salacious_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''panties2''"><img src="images/pc/items/salacious/panties/<<i>>.jpg" height="150" /></a> '
-		i += 1
-	if i <= 59:jump 'loopsalacious_panties'
+		i = 2
+
+		:loopsalacious_panties
+			if salacious_panties[i] = 0:
+				gs 'underwear_attributes', 'salacious_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''panties2''"><img src="images/pc/items/salacious/panties/<<i>>.jpg" height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 59:jump 'loopsalacious_panties'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'panties2':
@@ -246,18 +261,33 @@ if $ARGS[0] = 'bras':
 	cls
 	gs'stat'
 
+	gs 'bras', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'exhibitionistshop', 'start'
 	end
 
-	i = 2
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
 
-	:loopsalacious_bras
-		if salacious_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bras2''"><img src="images/pc/items/salacious/bras/<<i>>.jpg" height="150" /></a> '
-		i += 1
-	if i <= 37:jump 'loopsalacious_bras'
+		i = 2
+
+		:loopsalacious_bras
+			if salacious_bras[i] = 0:
+				gs 'underwear_attributes', 'salacious_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bras2''"><img src="images/pc/items/salacious/bras/<<i>>.jpg" height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 37:jump 'loopsalacious_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bras2':
@@ -281,14 +311,29 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
+	gs 'underwear_bodysuits', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'exhibitionistshop', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbodysuitquality_filter
+
+		i = 1
 
-	:loopsalacious_bodysuit
-		if salacious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		:loopsalacious_bodysuit
+			if salacious_bodysuits[i] = 0:
+				gs 'underwear_attributes', 'salacious_bodysuits', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+				end
+			end
 		i += 1
-	if i <= 40:jump 'loopsalacious_bodysuit'
+		if i <= 40:jump 'loopsalacious_bodysuit'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbodysuitquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bodysuit2':

locations/gadfield.qsrc

@@ -387,22 +387,24 @@ if $ARGS[0] = 'cow2':
 				act 'Continue':gt'gadfield','cow2'
 			end
 			if temper >= 15 and sunWeather = 1 and mira = 0:
-				act 'Swim (0:15)':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
-					'You spend a few minutes splashing around in the river, which feels cool and refreshing.'
-					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-					minut += 15
-					cumspclnt = 4 & gs 'cum_cleanup'
-					pcs_stam -= 3
-					pcs_mood += 5
-					if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-					if pcs_stren < 30:gs 'exp_gain', 'stren', 1
-					gs 'stat'
+				if pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
+					act 'Swim (0:15)':
+						*clr & cla
+						menu_off = 1
+						'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river.jpg"></center>'
+						'You spend a few minutes splashing around in the river, which feels cool and refreshing.'
+						if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+						cumspclnt = 4 & gs 'cum_cleanup'
+						pcs_stam -= 3
+						pcs_mood += 5
+						if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
+						gs 'exercise', 'tier1', 15, 'stren'
+						gs 'stat'
 
-					act 'Continue':gt'gadfield','cow2'
+						act 'Continue':gt'gadfield','cow2'
+					end
 				end
+
 				act 'Tan (0:30)':
 					*clr & cla
 					menu_off = 1

locations/gadriver.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = 'gadbitch':
 				act 'Continue': gt 'gadriver', 'gadbitch'
 			end
 		end
-		if PCloswimwear = 1:
+		if PCloswimwear = 1 and pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
 			act 'Go for a swim':
 				cla
 				*clr
@@ -671,8 +671,8 @@ if $ARGS[0] = 'gadbitch':
 								if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 								temp_gr = rand(0,15)
 								cumspclnt = 4 & gs 'cum_cleanup'
-								minut += 30
-								gs 'exercise', 'tier1', 1, 'stren'
+								minut += 20
+								gs 'exercise', 'tier1', 10, 'stren'
 								pcs_sweat = 10 + rand(0,4)
 								gs'stat'
 

locations/gschool_chats.qsrc

@@ -41,25 +41,67 @@ if $ARGS[0] = 'nerds':
 				*nl
 				gs 'gschool_groups', 'nerds'
 			elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-				gs 'npc_relationship', 'modify', 'A12', 'like'
-				gs 'npc_relationship', 'modify', 'A16', 'like'
-				if grupTipe = 3:
-					'You go to the classroom that you and your fellow nerds like to gather in and find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes, very pretty..." she says in agreement.'
+				if PCloInhibit >= 30 or PCloTopCut = 4:
+				grupvalue[3] -= 1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A159', 'like'
+					if grupTipe = 3:
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+					else
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
+					end
+				elseif CloStyle = 2:
+					grupvalue[3] -= 1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					if grupTipe = 3:
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+					else
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+					end
 				else
-					'You go to one of the classrooms that the nerds like to gather in and find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes, very pretty..." she says in agreement.'
+					gs 'npc_relationship', 'modify', 'A12', 'like'
+					gs 'npc_relationship', 'modify', 'A16', 'like'
+					if grupTipe = 3:
+						'You go to the classroom that you and your fellow nerds like to gather in and find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes, very pretty..." she says in agreement. You notice that she seems to struggle to look away.'
+					else
+						'You go to one of the classrooms that the nerds like to gather in and find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes, very pretty..." she says in agreement. You notice that her eyes remain on you for a few extra moments.'
+					end
+					'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				end
-				'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				*nl
 				gs 'gschool_groups', 'nerds'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				grupvalue[3] -= 1
-				gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
-				if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
-				gs 'npc_relationship', 'modify', 'A159', 'like'
-				if grupTipe = 3:
-					'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your choosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+				if PCloInhibit >= 35:
+					grupvalue[3] -= 1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A159', 'like'
+					if grupTipe = 3:
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+					else
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
+					end
+				elseif CloStyle = 2:
+					grupvalue[3] -= 1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					if grupTipe = 3:
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+					else
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on you a fraction longer but you can see that she''s wary of you and doesn''t approve of your attire and her gaze is all that welcoming either.'
+					end
 				else
-					'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
+					grupvalue[3] -= 1
+					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
+					if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A159', 'like'
+					if grupTipe = 3:
+						'You enter the classroom that you and your fellow nerds like to hang out in and find them, as usual, all gathered around a table talking and engaging in various hobby projects. A few of them look up as you walk closer. Feofan and Artem are struggling to conceal their disapproving stares about your chosen uniform while Julia''s eyes seem to linger on your attire for just a bit longer; you don''t feel her gaze is all that welcoming either.'
+					else
+						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
+					end
 				end
 				*nl
 				gs 'gschool_groups', 'nerds'
@@ -138,14 +180,19 @@ if $ARGS[0] = 'gopniks':
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-				if grupTipe = 4:
-					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
-				else
-					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
-				end
-				if CloStyle = 2:
+				if PCloInhibit >= 30 or PCloTopCut = 4:
+					grupvalue[4] += 5
+					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey it looks like there''s a wannabe slut approaching. Maybe I''ll ask you to you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Hey Dan, it might be your lucky day! I''m just surprised she''s not heading my way," Radomir says. You feel yourself getting a little nervous around them dressed the way you are and think that they might actually try something. After all no one other than a gopnik comes down to this end of the school at this time of the day without a good reason so you''d be on your own if they do.'
+				elseif CloStyle = 2:
 					grupvalue[4] += 5
 					'There are some nods of approval and positive comments made about your rebelious uniform style.'
+				else
+					if grupTipe = 4:
+						'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
+					else
+						'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
+					end
+					'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				end
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
@@ -156,11 +203,19 @@ if $ARGS[0] = 'gopniks':
 				gs 'npc_relationship', 'modify', 'A143', 'like'
 				gs 'npc_relationship', 'modify', 'A144', 'love'
 				gs 'npc_relationship', 'modify', 'A189', 'like'
-				if grupTipe = 4:
-					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+				if PCloInhibit >= 35:
+					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey it looks like there''s a wannabe slut approaching. Maybe I''ll ask you to you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Hey Dan, it might be your lucky day! I''m just surprised she''s not heading my way," Radomir says. You feel yourself getting a little nervous around them dressed the way you are and think that they might actually try something. After all no one other than a gopnik comes down to this end of the school at this time of the day without a good reason so you''d be on your own if they do.'
+				elseif CloStyle = 2:
+					grupvalue[4] += 5
+					'There are some nods of approval and positive comments made about your rebelious uniform style.'
 				else
-					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+					if grupTipe = 4:
+						'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+					else
+						'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+					end
 				end
+				*nl
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -174,7 +229,7 @@ if $ARGS[0] = 'gopniks':
 					pcs_mood -= 10
 					gs 'stat'
 					
-					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					*nl
 					'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
 					'Dan just swallows while everyone else shuts up. "Hey, I was just joking! We all know she''s your girl."'
@@ -188,14 +243,14 @@ if $ARGS[0] = 'gopniks':
 					'You head to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks over to you before grabbing you roughly by the arm and dragging you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				elseif grupTipe = 4:
-					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					'You head to the stairwell that you and your fellow gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					gs 'gschool_groups', 'gopniks'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				else
 					grupvalue[4] -= 5
 					gs 'fame', 'pav', 'sex', 3
 					
-					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me," Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there, slut. Why don''t you come over here and suck my dick?" Several of the other gopniks laugh and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me," Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all without a good reason.'
 					gs 'gschool_groups', 'gopniks'
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
@@ -259,7 +314,6 @@ if $ARGS[0] = 'cooljocks':
 				gs 'npc_relationship', 'modify', 'A148', -1
 				gs 'npc_relationship', 'modify', 'A149', -1
 				gs 'npc_relationship', 'modify', 'A165', -1
-				
 				if christinaQW['fight'] = 1 or christinaQW['blackmail'] = 2:
 					'As you approach them, you notice some of them giving you a disapproving look as Lizaveta takes your picture and starts texting, obviously sending the picture around. Vicky smirks before whispering something to Vanya and Katja.'
 				else
@@ -272,10 +326,40 @@ if $ARGS[0] = 'cooljocks':
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloQuality >= 4:
+				if PCloInhibit >= 30 or PCloTopCut = 4:
+					gs 'fame', 'pav', 'sex', 2
+					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
+					grupvalue[1] -= 2
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
+					grupvalue[2] -= 2
+					gs 'npc_relationship', 'modify', 'A1', 'hate'
+					gs 'npc_relationship', 'modify', 'A17', 'dislike'
+					gs 'npc_relationship', 'modify', 'A18', 'hate'
+					gs 'npc_relationship', 'modify', 'A22', 'hate'
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A139', 'dislike'
+					gs 'npc_relationship', 'modify', 'A140', 'dislike'
+					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
+					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
+					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
+				elseif CloStyle = 2:
+					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
+					grupvalue[1] -= 5
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
+					grupvalue[2] -= 5
+					gs 'npc_relationship', 'modify', 'A1', 'hate'
+					gs 'npc_relationship', 'modify', 'A17', 'dislike'
+					gs 'npc_relationship', 'modify', 'A18', 'hate'
+					gs 'npc_relationship', 'modify', 'A22', 'hate'
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A139', 'dislike'
+					gs 'npc_relationship', 'modify', 'A140', 'dislike'
+					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
+                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+				elseif PCloQuality >= 4:
 					grupvalue[1] += 1
 					grupvalue[2] += 1
-					gs 'npc_relationship', 'modify', 'A1', 1
 					gs 'npc_relationship', 'modify', 'A4', 1
 					gs 'npc_relationship', 'modify', 'A14', 1
 					gs 'npc_relationship', 'modify', 'A15', 1
@@ -285,21 +369,47 @@ if $ARGS[0] = 'cooljocks':
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 1
 					gs 'npc_relationship', 'modify', 'A139', 1
 					gs 'npc_relationship', 'modify', 'A140', 1
-					
 					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
 					'"Yeah I like it, it looks very nice," Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
-
-					gs 'gschool_groups', 'popular'
-					gs 'gschool_groups', 'jocks'
-					act 'Leave': gt 'gschool_lessons', 'short_break'
 				else
 					'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Christina, Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
-					gs 'gschool_groups', 'popular'
-					gs 'gschool_groups', 'jocks'
-					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
+				gs 'gschool_groups', 'popular'
+				gs 'gschool_groups', 'jocks'
+				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloQuality >= 4:
+				if PCloInhibit >= 35:
+					gs 'fame', 'pav', 'sex', 5
+					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
+					grupvalue[1] -= 5
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
+					grupvalue[2] -= 5
+					gs 'npc_relationship', 'modify', 'A1', 'hate'
+					gs 'npc_relationship', 'modify', 'A17', 'dislike'
+					gs 'npc_relationship', 'modify', 'A18', 'hate'
+					gs 'npc_relationship', 'modify', 'A22', 'hate'
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A139', 'dislike'
+					gs 'npc_relationship', 'modify', 'A140', 'dislike'
+					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
+					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
+					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
+				elseif CloStyle = 2:
+					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
+					grupvalue[1] -= 5
+					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
+					grupvalue[2] -= 5
+					gs 'npc_relationship', 'modify', 'A1', 'hate'
+					gs 'npc_relationship', 'modify', 'A17', 'dislike'
+					gs 'npc_relationship', 'modify', 'A18', 'hate'
+					gs 'npc_relationship', 'modify', 'A22', 'hate'
+					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A139', 'dislike'
+					gs 'npc_relationship', 'modify', 'A140', 'dislike'
+					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to look tough," Stasya says with a smirk.'
+                    'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
+                    '"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
+				elseif PCloQuality >= 4:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', 1
 					grupvalue[1] += 2
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1
@@ -307,11 +417,7 @@ if $ARGS[0] = 'cooljocks':
 					if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 					
 					'As you approach them, several of them give you approving looks. "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Stasya comments.' 
-					'"Yeah, looking sexy <<$pcs_nickname>>!" Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe to you in partucular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
-
-					gs 'gschool_groups', 'popular'
-					gs 'gschool_groups', 'jocks'
-					act 'Leave': gt 'gschool_lessons', 'short_break'
+					'"Yeah, looking sexy <<$pcs_nickname>>!" Vicky adds. Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves. However, you do notice Igor seems to be somewhat paying attention, maybe to you in particular. Christina just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be entirely unaware of the conversation.'
 				else
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', 1, 'male'
 					grupvalue[2] += 1
@@ -322,14 +428,13 @@ if $ARGS[0] = 'cooljocks':
 					gs 'npc_relationship', 'modify', 'A146', 'like'
 					gs 'npc_relationship', 'modify', 'A147', 'like'
 					gs 'npc_relationship', 'modify', 'A148', 'like'
-					
 					'As you approach them, several of them give you once over, obviously noticing your uniform. "Someone''s trying hard to get the boys to look at her," Stasya says with a smirk.'
 					'Hearing this, Bella gives you a closer look. "It wouldn''t be so bad if it was a good quality."'
 					'"Now Bella, you know her family can''t afford the finer things in life," Dimka adds. If not for the tone of his voice and the smirk, it would almost sound like he was defending you, but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
-					gs 'gschool_groups', 'popular'
-					gs 'gschool_groups', 'jocks'
-					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
+				gs 'gschool_groups', 'popular'
+				gs 'gschool_groups', 'jocks'
+				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
 				gs 'fame', 'pav', 'sex', 5
 				gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
@@ -343,10 +448,9 @@ if $ARGS[0] = 'cooljocks':
 				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 				gs 'npc_relationship', 'modify', 'A139', 'dislike'
 				gs 'npc_relationship', 'modify', 'A140', 'dislike'
-				
 				'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
 				'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
-				'Bella steps forward. "Get out of here with your whorish clothes! No one wants you around!" You hear several murmers of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
+				'Bella steps forward. "Get out of here with your whorish clothes! No one wants you around!" You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			end
 		else

locations/gschool_lessons4.qsrc

@@ -367,7 +367,7 @@ if $ARGS[0] = 'english':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
-				gs 'grades', 'class_activity_attributes', 'school', 'mus', pcs_intel
+				gs 'grades', 'class_activity_attributes', 'school', 'eng', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
 				pcs_traits['nerd_lessons'] += 1
 				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'

locations/housecall.qsrc

@@ -1,190 +1,168 @@
 # housecall
 
 if $ARGS[0] = 'ninel0':
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel00.jpg"></center>'
-	'You open the door. Standing in the threshold is a pretty young girl smiling at you carrying a doctors bag in her hand.'
-	'You look at her and realize she must be the doctor. "Hello, doctor"'
-	'She smiles at you. "Hello. My name is Ninel P. I am the new local doctor. Where is the patient?"'
-	'"That would be me."'
-	'She nods. "I Understand. Then I need you to go back to bed." She helps you back to bed.'
+	'You open the door and see a pretty young girl carrying a medical bag in her hand standing on the threshold.'
+	'She smiles at you. "Hello. My name is Ninel Pavlovna, and I''m the new local doctor. Where is the patient?"'
+	'"That would be me," you reply.'
+	'She nods. "I see. Then I need you to go back to bed."'
 
-	act 'Let the Doctor help you back to your bed':
+	act 'Let her help you back to bed':
 		cla
-		*clr
 		ninelmet = 1
-		'The doctor sits down on the edge of your bed and looks you over.'
-		'She asks. "What are the symptoms <<$pcs_nickname>>? Can I call you that?"'
-		'You smile weakly and nod yes. "Of course Doctor, I think I have the flu. My coughs are just killing me, making my throat very sore, and I think I have a fever too."'
+		'Ninel sits on the edge of your bed and looks you over.'
+		'"What are the symptoms, <<$pcs_nickname>>? Can I call you that?" she asks.'
+		'You smile weakly and nod. "Of course, Doctor. I think I have the flu. My coughs are just killing me, making my throat very sore, and I think I have a fever too."'
 		'She feels your forehead. "Runny nose? Headaches? Aching body?"'
-		'You nod. "Yes and sneezing!"'
-		'She nods in understanding. "Now I will need to examine you. Please get undressed."'
+		'You nod. "Yes. And sneezing!"'
+		'She nods. "I''ll need to examine you. Please undress."'
 
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			pcs_horny += 10
-			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom1.jpg"></center>'
-			'You get undressed, once your naked the doctor listens to your lungs with a stethoscope for a long time. Her hands feel cool and gentle as they touch and caress your skin as she uses the stethoscope.'
-			'As she listens. "Yes, wheezing. Now open your mouth."'
+			'Once you''re undressed, Ninel listens to your lungs with a stethoscope, her hands feeling cool and gentle as they touch and caress your skin.' 
+			'"Yes, wheezing. Now open your mouth."'
 
 			act 'Open your mouth':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel03.jpg"></center>'
-				'You open your mouth and the doctor examines your sore throat.'
-				'She uses a tongue depressor to look in your mouth. "Hmmm... your throat is very red and inflamed. Now I need to take your temperature."'
+				'You open your mouth and she examines your sore throat.'
+				'She uses a tongue depressor to look in your mouth. "Hmmm... Your throat is very red and inflamed. Now I need to take your temperature."'
 
 				act 'Take temperature':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel04.jpg"></center>'
-					'You keep your mouth open for the thermometer.'
-					'The doctor shakes her head no. "No, not orally. For a more accurate reading we need to take your temperature rectally."'
-					'Your eyes widen with surprise and you blush slightly. "Uh-uh."'
-					'The doctor smiles reassuringly to you. "Do not be embarrassed or afraid, <<$pcs_nickname>>, is not painful."'
-					'You hesitate a moment. "Well if you''re sure."'
-					'The doctor pats your shoulder. "I''m sure. Now lie down and roll over onto your stomach. Then I will need you to use your hands to spread buttocks."'
-
-					act 'Do as the Doctor asks':
-						cla
-						*clr
-						clr
-						gs 'stat'
+					'You keep your mouth open for the thermometer, but she shakes her head. "No, not orally. For a more accurate reading, we need to take your temperature rectally."'
+					'Your eyes widen with surprise and you blush slightly. "Oh."'
+					'She smiles reassuringly at you. "Don''t be embarrassed or afraid, <<$pcs_nickname>>. It''s not painful."'
+					'You hesitate. "Well, if you''re sure..."'
+					'She pats your shoulder. "I''m sure. Now lie down and roll over onto your stomach. I''ll need you to use your hands to spread your buttocks."'
+
+					act 'Do as the doctor asks':
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom2.jpg"></center>'
-						'You obediently roll over and spread ass cheeks with your hands. The Doctor lubricates your anus thoroughly and deftly slides the thermometer in your ass. You flinch slightly, not from pain, but pleasure. The Doctor slowly slides the thermometer up and down in your ass, you find the sensation very pleasant feeling. As she does, you feel your excitement growing.'
-
+						'You obediently roll over and spread your ass cheeks as Ninel lubricates your anus thoroughly and deftly slides the thermometer into your ass. You flinch slightly, not from pain, but pleasure, as she slowly slides the thermometer in and out of your ass. As she does, you feel your excitement growing and your pussy getting wet.'
 						anal_slip += 8
 						gs 'arousal', 'anal', 10, 'sub', 'lesbian'
 						gs 'stat'
 						
 						if pcs_horny >= 50:
 							act 'Moan with pleasure':
-								cla
-								*clr
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
-								'The Doctor pulls the thermometer out of your ass and checks.'
-								'She makes a tsking sound and shaking her head. "39.2 Very bad. Please turn over on your back, I will need to palpate the lymph nodes."'
+								'She pulls the thermometer out of your ass and tuts while shaking her head. "39.2. Very bad. Please turn over on your back. I need to palpate the lymph nodes."'
 
 								act 'Roll back over':
-									cls
-									gs 'stat'
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom5.jpg"></center>'
-									'The doctor began to stroke and knead your stomach and thighs. You are not so sure that this is a medical procedure, she seems take too long and is to tender, but it feels very nice and you do not object.'
-									'Your excitement, meanwhile is growing, you feel your pussy moisten, as you begin to moan sweetly.'
-
+									'You roll back over and she strokes and kneads your stomach and thighs. You''re not so sure if this is an actual medical procedure since she seems to take too long and is too tender, but it feels very nice and you do not object.'
+									'Your excitement is growing and you feel your pussy moisten as you moan sweetly.'
 									gs 'arousal', 'massage', 15, 'lesbian'
 									gs 'stat'
 									
 									act 'Blush with embarrassment':
-										cls
-										gs 'stat'
+										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom6.jpg"></center>'
-										'You blush with embarrassment, but doctors hands work their way down to your pussy as she begins to caress your pussy.'
-										'"Doctor, what are you doing!" You feel embarrassed, outraged and frightened at the same time.'
-										'"Masturbating you, silly. I feel the magic in you, which means you''re one of us, and I can use my healing powers on you." She says as she continues to caress your clitoris'
-										'"So you''re a magician, too?"'
-										'"Yes, only mine is a special kind of magic, Tantric. Have you heard of it?"'
-										'Shaking your head. "No, I do not think so."'
-										'"It''s magic, based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
-										'"So?"'
-										'Since you have not asked her to stop she keeps caressing your clitoris. "That is, if we have sex, I can heal you, if you agree of course. Do you agree?"'
-										'"And what do you get in return?"'
-										'"Nothing, I''m doing this solely for my own satisfaction. You see I can only cast if I having an orgasm."'
+										'You blush with embarrassment, but the doctor''s hands work their way down to your pussy.'
+										'"Doctor, what are you doing?!" You feel embarrassed, outraged and frightened at the same time.'
+										'"Masturbating you, silly. I feel the magic in you, which means you''re one of us, and I can use my healing powers on you," she says as she continues to caress your clitoris.'
+										'"So you''re a succubus too?!"'
+										'"Yes, only mine is a special kind of magic. Tantric. Have you heard of it?"'
+										'You shake your head. "No, I don''t think so..."'
+										'"It''s magic based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
+										'"So?" you ask.'
+										'Since you haven''t asked her to stop, she keeps caressing your clitoris. "That is, if we have sex, I can heal you, if you agree of course. Do you agree?"'
+										'"And what should I do in return?"'
+										'"Nothing. I''m doing this solely for my own satisfaction."'
 										'Feeling your arousal mounting you find yourself nodding your head. "Then I agree."'
-
 										gs 'arousal', 'vaginal_finger', 15, 'lesbian'
 										gs 'arousal', 'end'
 										gs 'stat'
 										
-										act 'Agree':gt 'housecall', 'ninel2'
+										act 'Agree': gt 'housecall', 'ninel2'
 									end
 								end
 							end
 						end
 
 						act 'Indignant':
-							cla
-							*clr
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
-							'Feeling confused. "Doctor, what are you doing?"'
-							'She slides the thermometer out of your ass and calmly replies.'
-							'"Your temperature is 39.2, that is very bad."'
+							'You''re starting to feel confused. "Doctor, what are you doing?"'
+							'She slides the thermometer out of your ass. "Your temperature is 39.2. Very bad," she calmly replies.'
 
 							if sick < 48:
 								act 'Doctor, what''s wrong with me?':
 									cla
 									'Your voice shakes slightly with fear. "Doctor, what''s wrong with me?"'
-									'"You really do have the flu. Now I''ll give you an injection of antibiotic and antipyretic, it should make you feel better soon. Now roll back over so I can give you, your shot."'
+									'"You really do have the flu. Now I''ll give you an injection of antibiotic and antipyretic which should make you feel better soon. Now roll back over so I can give you your shot."'
 
-									act 'Lie on your stomach and bare ass':
-										cls
+									act 'Lie on your stomach':
+										*clr & cla
 										minut += 10
 										sick -= 2
 										lekar += 3
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom4.jpg"></center>'
-										'Once you roll back over the doctor gives you an injection in the butt, you wince slightly in pain.'
-										'She gives you a slight reassuring pat."We are just about done with everything. I prescribing you lots of bed rest, hot drinks, antibiotics, nose drops and a balanced diet. When the temperature drops, make an appointment at the clinic for a followup."'
-										'You nod."Thank you Doctor."'
-										'The Doctor gets up. "Goodbye <<$pcs_nickname>>, get lots of rest." Then she leaves.'
+										'Once you roll back over, Ninel gives you an injection in the ass and you wince slightly in pain.'
+										'She gives you a slight reassuring pat. "We''re just about done with everything. I''m prescribing you lots of bed rest, hot drinks, antibiotics, nose drops and a balanced diet. When your temperature drops, make an appointment at the clinic for a follow-up."'
+										'You nod. "Thank you, Doctor."'
+										'She gets up. "Goodbye, <<$pcs_nickname>>. Get lots of rest," she says before leaving.'
 
-										act 'Back to bed':gt 'bedr'
+										act 'Back to bed': gt 'bedr'
 									end
 								end
 							elseif sick >= 48:
 								act 'Doctor, what''s wrong with me?':
 									cla
 									'Your voice shakes slightly with fear. "Doctor, what''s wrong with me?"'
-									'She shakes her head sadly. "I''m afraid that you have angina, <<$pcs_nickname>>. I would advise you to check yourself in."'
-									'"What in the hospital, or something?"'
-									'She nods her head yes. "Yes"'
+									'She shakes her head. "I''m afraid that you have angina, <<$pcs_nickname>>. I would advise you to check yourself in."'
+									'"What, in the hospital or something?"'
+									'She nods her head. "Yes."'
 
 									act 'Agree':
 										cla
-										'You start crying and coughing. "If you think I really need to."'
-										'"I''m afraid so, this is a serious disease. But do not worry, we have a wonderful hospital."'
-										'Nodding you agree. "Ok, if I need to go."'
+										'You start crying and coughing. "If you think I really need to..."'
+										'"I''m afraid so. This is a serious disease."'
+										'You nod. "Okay, if I need to go..."'
 
 										act 'Go to hospital':
 											cla
-											*clr
 											minut += 120
 											gt 'city_clinic', 'drPP'
 										end
 									end
 
 									act 'Don''t want to go':
-										cla
-										*clr
-										'You start crying and coughing. "Oh, Doctor, I do not want to go to the hospital."'
-										'She frowns slightly then looks thoughtful. "Well, I guess we could try an out patient treatment. In that case I will need to give you a couple of shots, to start with."'
-										'You stop crying and smile to her. "Oh, thank you, doctor!"'
+										*clr & cla
+										'You start crying and coughing. "I don''t want to go to the hospital!"'
+										'She frowns slightly, then looks thoughtful. "Well, I guess we could try an outpatient treatment. In that case, I''ll need to give you a few shots to start with."'
+										'You stop crying and smile at her. "Oh, thank you, doctor!"'
 
-										act 'Lie on your stomach and bare ass':
-											cls
+										act 'Lie on your stomach':
+											*clr & cla
 											minut += 15
 											pcs_horny = 100
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom9.jpg"></center>'
-											'The doctor gives you a couple of shot in your butt cheek, you find yourself suddenly becoming incredible sexual aroused. Between your thighs you feel your pussy become soaked and aching to be invaded. You breath quickens and your nipples grow hard with desire.'
-											'Embarrassed and in a state of panic. "Doctor, what''s happening?" You practically moan out the words'
-											'She nods knowingly. "Yeah! I knew it. I can feel the magic in you, which means you''re one of us, and I can use my powers to heal you."'
-											'"So you''re a magician, too?"'
-											'"Yes, only mine is a special kind of magic, Tantric. Have you heard of it?"'
-											'Shaking your head. "No, I do not think so."'
-											'"It''s magic, based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
-											'"So?"'
-											'"That is, if we have sex, so I can heal you, if you agree of course. Do you agree?"'
-											'"And what do you get in return?"'
-											'"Nothing, I''m doing this solely for my own satisfaction. You see I can only cast if I''m having an orgasm."'
-											'Feeling your arousal mounting you find yourself nodding your head. "Then I agree."'
-
-											act 'Agree':gt 'housecall', 'ninel2'
+											'She gives you a few shots in the ass and you find yourself suddenly becoming incredibly aroused, your pussy growing wet and aching to be invaded as your breath quickens and your nipples grow hard with desire.'
+											'"Doctor, what''s happening?!" You practically moan out the words.'
+											'She nods knowingly. "I knew it! I can feel the magic in you, which means you''re one of us, and I can use my powers to heal you!"'
+											'"So you''re a succubus too?!"'
+											'"Yes, only mine is a special kind of magic. Tantric. Have you heard of it?"'
+											'You shake your head. "No, I don''t think so..."'
+											'"It''s magic based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
+											'"So?" you ask.'
+											'"That is, if we have sex, I can heal you, if you agree of course. Do you agree?"'
+											'"And what should I do in return?"'
+											'"Nothing. I''m doing this solely for my own satisfaction."'
+											'Feeling your arousal mounting, you find yourself nodding your head. "Then I agree."'
+
+											act 'Agree': gt 'housecall', 'ninel2'
 										end
 									end
 								end
@@ -198,113 +176,95 @@ if $ARGS[0] = 'ninel0':
 end
 
 if $ARGS[0] = 'ninel1':
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel10.jpg"></center>'
-	'Thankfully you left the door unlocked, so you wouldn''t have to get up again. When the doorbell rang, you hoarsely shouted:'
-	'"It''s open! I''m in the bedroom!" You yell as you start coughing.'
-	'A pretty young girl carrying a doctors bag walks into your bedroom and stops beside the bed, carefully considering you.'
-	'You look at her and realize she must be the doctor. "Hello, doctor"'
-	'She smiles at you. "Hello. My name is Ninel P. I am the new local doctor. You called for a doctor?"'
-	'Nodding. "That would be me."'
-	'She nods. "I Understand. What are your symptoms <<$pcs_nickname>>? Can I call you that?"'
+	'Thankfully, you left the door unlocked so you wouldn''t have to get up again. When the doorbell rings, you hoarsely shout "It''s open! I''m in the bedroom!"'
+	'A pretty young girl carrying a medical bag walks into your bedroom and stops beside the bed, carefully looking you over.'
+	'She smiles at you. "Hello. My name is Ninel Pavlovna, and I''m the new local doctor. I assume you''re the patient?"'
+	'"Yes, that''s me."'
+	'She nods. "I see. What are your symptoms, <<$pcs_nickname>>? Can I call you that?"'
 
 	act 'Complain':
-		cla
-		*clr
+		*clr & cla
 		ninelmet = 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel11.jpg"></center>'
-		'You nod yes. "Of course, Doctor, I think I have the flu. My coughs are just killing me, making my throat very sore, and I think I have a fever too."'
+		'You nod. "Of course, Doctor. I think I have the flu. My coughs are just killing me, making my throat very sore, and I think I have a fever too."'
 		'She feels your forehead. "Runny nose? Headaches? Aching body?"'
-		'You nod."Yes and sneezing!"'
-		'The doctor sits down on the edge of your bed and takes your arm by the wrist, feeling your pulse.'
-		'For a moment you thought you felt power emanating from her fingers, but decide your fever was making you imagine it.'
-		'She looks at you. "Now undress please so I can examine you.'
+		'You nod. "Yes. And sneezing!"'
+		'She sits on the edge of your bed and takes your arm by the wrist, feeling your pulse.'
+		'For a moment, you think you feel power emanating from her fingers, but decide your fever is making you imagine it.'
+		'She looks at you. "Undress so I can examine you please."'
 
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			pcs_horny += 10
-			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel12.jpg"></center>'
-			'You get undressed, once your naked the doctor listens to your lungs with a stethoscope, for a long time. Her hands feel cool and gentle as they touch and caress your skin as she uses the stethoscope.'
-			'As she listens. "Yes, wheezing. Now open your mouth."'
+			'Once you''re undressed, Ninel listens to your lungs with a stethoscope, her hands feeling cool and gentle as they touch and caress your skin.' 
+			'"Yes, wheezing. Now open your mouth."'
 
 			act 'Open your mouth':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel03.jpg"></center>'
-				'You opened your mouth and the doctor examines your sore throat.'
-				'She uses a tongue depressor to look in your mouth. "Hmmm... your throat is very red and inflamed. Now we need to take your temperature."'
+				'You open your mouth and she examines your sore throat.'
+				'She uses a tongue depressor to look in your mouth. "Hmmm... Your throat is very red and inflamed. Now I need to take your temperature."'
 
 				act 'Let her take your temperature':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel04.jpg"></center>'
-					'You keep your mouth open for the thermometer.'
-					'The doctor shakes her head no. "No, not orally. For a more accurate reading we need to take your temperature rectally."'
-					'Your eyes widen with surprise and you blush slightly. "Uh-uh."'
-					'The doctor smiles reassuringly to you. "Do not be embarrassed or afraid, <<$pcs_nickname>>, is not painful."'
-					'You hesitate a moment. "Well if you''re sure."'
-					'The doctor pats your shoulder. "I''m sure. Now lie down and roll over onto your stomach. Then I will need you to use your hands to spread buttocks."'
-
-					act 'Roll over and show ass':
-						cls
-						gs 'stat'
+					'You keep your mouth open for the thermometer, but she shakes her head. "No, not orally. For a more accurate reading, we need to take your temperature rectally."'
+					'Your eyes widen with surprise and you blush slightly. "Oh."'
+					'She smiles reassuringly at you. "Don''t be embarrassed or afraid, <<$pcs_nickname>>. It''s not painful."'
+					'You hesitate. "Well, if you''re sure..."'
+					'She pats your shoulder. "I''m sure. Now lie down and roll over onto your stomach. I''ll need you to use your hands to spread your buttocks."'
+
+					act 'Roll over':
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/rectaltemp.jpg"></center>'
-						'You obediently roll over and spread ass cheeks with your hands. The Doctor lubricates your anus thoroughly and deftly slides the thermometer in your ass. You flinch slightly, not from pain, but pleasure. The Doctor slowly slides the thermometer up and down in your ass, you find the sensation very pleasant feeling. As she does, you feel your excitement growing and pussy getting wet.'
-						'Yet again for a moment you thought you felt power emanating from her fingers.'
-
+						'You obediently roll over and spread your ass cheeks with your hands as Ninel lubricates your anus thoroughly and deftly slides the thermometer into your ass. You flinch slightly, not from pain, but pleasure, as she slowly slides the thermometer in and out of your ass. As she does, you feel your excitement growing and your pussy getting wet.'
+						'Again, you swear that you feel power emanating from her fingers.'
 						anal_slip += 8
 						gs 'arousal', 'anal', 10, 'sub', 'lesbian'
 						gs 'stat'
 						
 						act 'Doctor, what''s happening?':
-							cls
-							gs 'stat'
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel13.jpg"></center>'
-							'Ninel lies down next to you and starts to kiss and caress your naked body. You feel confused and horrified by her behavior, but she is so gentle. Your body responds to her kisses and caressing, your nipples growing hard and your pussy becoming soaking wet. You are to excited to resist. The only thing that you manage is to moan out.'
+							'Ninel lies down next to you and starts to kiss and caress your naked body. You feel confused and horrified by her behavior, but she''s so gentle. Your body responds to her kisses and caressing, your nipples growing hard and your pussy becoming soaking wet. You''re too excited to resist and moan out in pleasure.'
 							'"Doctor, what are you doing? What''s going on?"'
-							'She nods knowingly. "Yeah! I knew it. I can feel the magic in you, which means you''re one of us, and I can use my powers to heal you."'
-							'"So you''re a magician, too?"'
-							'"Yes, only mine is a special kind of magic, Tantric. Have you heard of it?"'
-							'Shaking your head. "No, I do not think so."'
-							'"It''s magic, based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
-							'"So?"'
+							'She nods knowingly. "I knew it! I can feel the magic in you, which means you''re one of us, and I can use my powers to heal you!"'
+							'"So you''re a succubus too?!"'
+							'"Yes, only mine is a special kind of magic. Tantric. Have you heard of it?"'
+							'Shaking your head. "No, I don''t think so..."'
+							'"It''s magic based on sensuality and sex. Roughly speaking, I can cast only while I''m having sex."'
+							'"So?" you ask.'
 							'"That is, if we have sex, I can heal you, if you agree of course. Do you agree?"'
-							'"And what do you get in return?"'
-							'"Nothing, I''m doing this solely for my own satisfaction. You see I can only cast if I have an orgasm."'
-							'Feeling your arousal mounting you find yourself nodding your head. "Then I agree."'
-
+							'"And what should I do in return?"'
+							'"Nothing. I''m doing this solely for my own satisfaction."'
+							'Feeling your arousal mounting, you find yourself nodding your head. "Then I agree."'
 							gs 'arousal', 'kiss', 10, 'lesbian'
 							gs 'arousal', 'foreplay', 10, 'lesbian'
 							minut -= 10
 							gs 'stat'
 						
 							act 'Agree':
-								cls
-								gs 'stat'
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel14.jpg"></center>'
-								'Ninel opens her blouse, exposing beautiful breasts, her nipples already hard. You realize she is just as aroused as you.'
-								'She caresses your breasts with her hands. Then she lowers her mouth to your breast, her lips closing around your nipple as she starts to suck on your nipple. You moan softly as your arousal grows ever stronger.'
-								'Ninel slides her hand down your stomach and between your thighs, her fingers begin to caress your clitoris. After a few minutes she slips her fingers inside your pussy, fucking you with her fingers. As you moan in pleasure.'
-
+								'Ninel opens her blouse, exposing her breasts, her nipples already hard. You realize she''s just as aroused as you.'
+								'She caresses your breasts with her hands, then lowers her mouth to your breast and starts sucking on your nipple. You moan softly as your arousal grows even stronger.'
+								'Ninel slides her hand down your stomach and between your thighs, her fingers caressing your clitoris. After a few minutes, she slips her fingers inside your pussy as you moan in pleasure.'
 								gs 'arousal', 'kiss', 10, 'lesbian'
 								gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 								minut -= 10
 								gs 'stat'
 							
 								act 'Enjoy':
-									cls
-									gs 'stat'
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel15.jpg"></center>'
-									'You moan under the caressing of her lips and fingers. "Oh God! That feels amazing." She slides her body down along slide yours, her tongue trailing down your skin.'
-									'As her head reaches your waist she crawls between you legs, moments later you can feel her tongue lapping at you soaking wet pussy, then her tongue beings to explore inside of your wet depths.'
-									'As your arousal peaks, you feel yourself screaming in ecstasy, your body trembling as wave after wave of pleasure rips through your body, your orgasms come so hard and fast you can barely catch your breath.'
-									'You moan. "Ah, Ah, yes! More, more-oh-oh-oh! Oh god yes!"'
-
+									'You moan under the caressing sensation of her lips and fingers, she slides her body down alongslide yours, her tongue trailing down your skin.'
+									'As her head reaches your waist, she crawls between your legs and you feel her tongue lapping at your soaking wet pussy seconds later before her tongue starts exploring inside your wet depths.'
+									'As your arousal peaks, you feel yourself screaming in ecstasy, your body trembling as wave after wave of pleasure rips through your body, your orgasms come so hard and fast you can barely catch your breath. "Ah, Ah, yes! More, more-oh-oh-oh! Oh god yes!"'
 									$orgasm_or = 'yes'
 									gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 									gs 'arousal', 'cuni', 10, 'lesbian'
@@ -312,42 +272,37 @@ if $ARGS[0] = 'ninel1':
 									gs 'stat'
 							
 									act 'Change position':
-										cls
-										gs 'stat'
+										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel16.jpg"></center>'
-										'As your orgasm wrack your body, Ninel crawls forward and straddles your stomach as she leans forward. Her hand going back to your crotch as her fingers plunge back into your wet depths. You can feel her pussy juices flowing down her thighs and onto your stomach. You groan, as your hands ecstatically squeeze her butt checks, holding onto her tightly.'
-										'Ninel fingers plunge in and out of your pussy frantically, her own breath coming in short gasps now.'
-										'"Oh, <<$pcs_nickname>>, <<$pcs_nickname>>!"She exhales. "I want to feel your fingers in me!'
-
+										'As your orgasm wracks your body, Ninel crawls forward and straddles your stomach as she leans forward and her fingers plunge back into your wet depths. You can feel her pussy juices flowing down her thighs and onto your stomach. You groan as your hands ecstatically squeeze her ass, holding onto her tightly.'
+										'Her fingers frantically plunge in and out of your pussy, her own breath coming in short gasps now.'
+										'"Oh <<$pcs_nickname>>!" she exhales. "I want to feel your fingers in me!'
 										gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 										gs 'stat'
 									
-										act 'Caress Ninel':
-											cla
-											*clr
+										act 'Caress her':
+											*clr & cla
 											ninelsex += 1
 											'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel17.jpg"></center>'
-											'You crawl out from under her, leaving her on all fours. Both of your hands seek out her wet pussy, at first rubbing her clit and lips, then a couple of your fingers slide inside of her pussy as you being to finger fuck her. While your other hand slides up to her asshole, leaving a trail of wetness from you soaking wet fingers. After only a moment you slide one of those fingers into her ass. Now your finger fucking both her ass and pussy with your hands.'
-											'She screams in ecstasy, her muscles clench and tighten on your fingers. You begin to furiously finger fuck Ninel adding a third finger inside of her pussy and a second inside of her ass, while she squirms under you pleading'
-											'"Please do not stop! That''s it! Yes, ah! Oh yeah, ah!"'
-
+											'You crawl out from under her, leaving her on all fours. Your fingers seek out her wet pussy, rubbing her clit and lips before sliding inside her pussy. You start finger fucking her while your other hand slides up to her asshole, leaving a trail of wetness from your soaking wet fingers. You then slide your finger into her ass.'
+											'She screams in ecstasy, her muscles clenching and tightening around your fingers as you furiously finger fuck her, adding a third finger inside her pussy and a second inside her ass as she squirms under you.'
+											'"Please don''t stop! Yes! Oh yeah!"'
 											gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 											gs 'arousal', 'anal_finger_give', 10, 'lesbian'
 											minut -= 10
 											gs 'stat'
 											
 											act 'Orgasm':
-												cls
-												if ninelsex = 1:girl += 1
+												*clr & cla
+												if ninelsex = 1: girl += 1
 												sick = 0
 												pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
 												pcs_mood = 100
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel18.jpg"></center>'
-												'You feel that your about to explode again, Ninel seems to sense this, turning she pushes you down on your back. She straddles your face as she leans forward to bury her face in your crotch again.'
-												'Without hesitation, you plunge your fingers deep inside of her again and begin to furiously finger fuck her again. While Ninel uses her tongue to lap at your swollen clit and slip inside your pussy, flicking her tongue around inside of you. Within moments her body shakes and spasms, your finger and hand becomes soaked. Her juices flow down her inner thighs and even drip on your face. While she buries her tongue as deeply inside of you, as it will go.'
-												'You have a feeling of ecstasy so powerful it overwhelms you leaving you stunned at the sheer intensity of your orgasm. You shout and wither against the almost unbearable pleasure and it goes on and on seemingly without end. You feel like you are about to pass out when it almost mercifully it passes.'
-
+												'You feel like you''re about to explode again and Ninel seems to sense this, turning around and pushing you down on your back. She straddles your face as she leans forward to bury her face in your crotch again.'
+												'Without hesitation, you plunge your fingers deep inside her again while Ninel uses her tongue to lap at your swollen clit before slipping it back inside your pussy, flicking her tongue around inside of you. Within seconds, her body shakes and spasms as her juices flow down her inner thighs and drip on your face while she buries her tongue as deeply inside you as it will go.'
+												'You have a feeling of ecstasy so powerful it overwhelms you, leaving you stunned at the sheer intensity of your orgasm. You shout and wither against the almost unbearable pleasure and it goes on and on, seemingly without end. You feel like you''re about to pass out when it almost mercifully passes.'
 												$orgasm_or = 'yes'
 												gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 												gs 'arousal', 'cuni', 10, 'lesbian'
@@ -355,22 +310,19 @@ if $ARGS[0] = 'ninel1':
 												gs 'stat'
 												
 												act 'Lie exhausted':
-													cla
-													*clr
+													*clr & cla
 													minut += 30
-													clr
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel19.jpg"></center>'
-													'You lay there panting, sweating and exhausted on your bed. Ninel snuggles as the two of you share a gentle kiss.'
-													'She looks at you. "Well, how do you feel?"'
-													'Unable to resist grinning. "Ooh, Just perfect" You answer and only then do you realize just how well you do feel. The sickness seems to have passed and you feel perfectly healthy, not to mention in a wonderful mood. The sweet bouquet of sex drifts in the air and the exhaustion makes this an even more pleasant sensations.'
-													'She smiles at you. "Well, It''s magic, baby. Mm-m, you''re just a miracle. For a long time I have not gotten so much pleasure from my magic. If you get sick again, just call me or if you just want to spend time with me. You can also look for me in the clinic.'
-													'You promised to be sure to find her, closing your eyes falling asleep. While you were sleeping, Ninel quietly dressed and left.'
-
+													'You lay panting, sweating and exhausted on your bed. Ninel snuggles as the two of you share a gentle kiss.'
+													'She looks at you. "Well? How do you feel?"'
+													'"Ooohh. Perfect..." you answer and only then do you realize just how well you do feel. The sickness seems to have passed and you feel perfectly healthy, not to mention the wonderful mood you''re suddenly in. The sweet bouquet of sex drifts in the air and the exhaustion makes this an even more pleasant sensation.'
+													'She smiles at you. "Well, It''s magic, baby. Mm-m, you''re just a miracle. I''ve haven''t recieved so much pleasure from my magic in a long time. If you get sick again, just call me. You can also look for me in the clinic if you just want to see me.'
+													'You close your eyes and fall asleep as Ninel quietly gets dressed.'
 													gs 'arousal', 'end'
 													gs 'stat'
 													
-													act 'Sleep':gt 'bed2'
+													act 'Sleep': gt 'bed2'
 												end
 											end
 										end
@@ -386,69 +338,61 @@ if $ARGS[0] = 'ninel1':
 end
 
 if $ARGS[0] = 'ninel2':
-	cls
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel13.jpg"></center>'
-	'Ninel lies down next to you and starts to kiss and caress your naked body. You feel confused and horrified by her behavior, but she was so gentle. Your body responds to her kisses and caresses, your nipples grow hard and your pussy becomes soaking wet. You are too excited to resist.'
-
+	'Ninel lies down next to you and starts to kiss and caress your naked body. You feel confused and horrified by her behavior, but she''s so gentle. Your body responds to her kisses and caresses, your nipples grow hard and your pussy grows wet. You''re too excited to resist...'
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
 	
 	act 'Surrender to your arousal':
-		cls
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel14.jpg"></center>'
-		'Ninel opens her blouse, exposing beautiful breasts, her nipples already hard. You realize she is just as aroused as you.'
-		'She caresses your breasts with her hands. Then she lowers her mouth to your breast, her lips closing around you nipple as she starts to suck your nipple. You moan softly as you arousal grows ever stronger.'
-		'Ninel slides her hand down your stomach and between your thighs, her fingers begin to caress your clitoris. After a few minutes she slips her fingers inside of your pussy, fucking you with her fingers. As you moan in pleasure.'
-
+		'Ninel opens her blouse, exposing her breasts, her nipples already hard. You realize she''s just as aroused as you.'
+		'She caresses your breasts with her hands, then lowers her mouth to your breast and starts sucking on your nipple. You moan softly as your arousal grows even stronger.'
+		'Ninel slides her hand down your stomach and between your thighs, her fingers caressing your clitoris. After a few minutes, she slips her fingers inside your pussy as you moan in pleasure.'
 		gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 		gs 'stat'
 		
 		act 'Enjoy':
-			cls
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel15.jpg"></center>'
-			'You moan under the caressing of her lips and fingers. "Oh God! That feels amazing." She slides her body down along slide yours, her tongue trailing down your skin.'
-			'As her head reaches your waist she crawls between you legs, moments later you can feel her tongue lapping at you soaking wet pussy and then her tongue beings to explore inside of your wet depths.'
-			'As your arousal moments, you feel yourself screaming in ecstasy, your body trembling as wave after wave of pleasure rips through your body, your orgasms come so hard and fast you can barely catch your breath.'
-			'You moan. "Ah, Ah, yes! More, more-oh-oh-oh! Oh god yes!"'
-
+			'You moan under the caressing of her lips and fingers. "Oh god, that feels amazing!" She slides her body down alongside yours, her tongue trailing down your skin.'
+			'As her head reaches your waist, she crawls between your legs and you feel her tongue lapping at your soaking wet pussy before it starts exploring inside your wet depths.'
+			'As your arousal grows, you feel yourself screaming in ecstasy, your body trembling as wave after wave of pleasure rips through you, your orgasms coming so hard and fast that you can barely catch your breath. "Ah, ah, yes! More, more-oh-oh-oh! Oh god yes!"'
 			gs 'arousal', 'cuni', 10, 'lesbian'
 			gs 'stat'
-									
+		
 			act 'Change position':
-				cls
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel16.jpg"></center>'
-				'As an orgasm wracks your body, Ninel crawls forward and straddles your stomach, she leans forward. Her hand going back to your crotch as her fingers plunge back into your wet depths. You can feel her pussy juices flowing down her thighs onto your stomach. You groan, as your hands ecstatically squeeze her butt checks, holding onto her tightly.'
-				'Ninel fingers plunge in and out of your pussy frantically, her own breath coming in short gasps now.'
-				'"Oh, <<$pcs_nickname>>, <<$pcs_nickname>>!"She exhales. "I want to feel your fingers in me!'
-
+				'As an orgasm wracks your body, Ninel crawls forward and straddles your stomach. She leans forward and her hand slides down to your crotch as her fingers plunge back into your wet depths. You can feel her pussy juices flowing down her thighs onto your stomach. You groan as your hands ecstatically squeeze her ass, holding onto her tightly.'
+				'Ninel fingers frantically plunge in and out of your pussy, her own breath coming in short gasps now.'
+				'"Oh <<$pcs_nickname>>!" She exhales. "I want to feel your fingers in me!"'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 				gs 'stat'
-									
+			
 				act 'Return the favor':
-					cls
+					*clr & cla
 					ninelsex += 1
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel17.jpg"></center>'
-					'You crawl out from under her, leaving her on all fours. Both of your hands seek out her wet pussy, at first rubbing her clit and lips, then couple of your fingers slide inside of her pussy as you being to finger fuck her. While your other hand slides up to her asshole, leaving a trail of wetness from you soaking wet fingers. After only a moment you slide one of those fingers into her asshole. Now your finger fucking both her ass and pussy with your hands.'
-					'She screams in ecstasy, her muscles clench and tighten on your fingers. You begin to furiously finger fuck Ninel adding a third finger inside of her pussy and a second inside of her ass, while she squirms under you, pleading'
-					'"Please do not stop! That''s it! Yes, ah! Oh yeah, ah!"'
-
+					'You crawl out from under her, leaving her on all fours. Your fingers seek out her wet pussy, rubbing her clit and lips before sliding inside her pussy. You start finger fucking her while your other hand slides up to her asshole, leaving a trail of wetness from your soaking wet fingers. You then slide your finger into her ass.'
+					'She screams in ecstasy, her muscles clenching and tightening around your fingers as you furiously finger fuck her, adding a third finger inside her pussy and a second inside her ass as she squirms under you.'
 					gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 					gs 'arousal', 'anal_finger_give', 10, 'lesbian'
 					minut -= 10
 					gs 'stat'
-									
-					act 'orgasm':
-						cls
+				
+					act 'Orgasm':
+						*clr & cla
 						if ninelsex = 1:girl += 1
 						sick = 0
 						pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
 						pcs_mood = 100
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel18.jpg"></center>'
-						'You feel yourself about to explode again, Ninel seems to sense this, turning she pushes you down on your back. She straddles your face as she leans forward to bury her face in your crotch again.'
-						'Without hesitation, you plunge your fingers deep inside of her again and begin to furiously finger fuck her again. While Ninel uses her tongue to lap at your swollen clit and slip inside your pussy, flicking around inside of you. Within moments her body shakes and spasms, your finger and hand becomes soaked. Her juices flow down her inner thighs and even drip on your face. While she buries her tongue as deeply inside of you as it will go.'
-						'You have a feeling of intense ecstasy so powerful it leaves you stunned, at the sheer intensity of your orgasm. You shout and wither against the almost unbearable pleasure, it goes on and on seemingly without end. You feel like you are about to pass out when it almost mercifully it passes.'
-
+						'You feel like you''re about to explode again and Ninel seems to sense this, turning around and pushing you down on your back. She straddles your face as she leans forward to bury her face in your crotch again.'
+						'Without hesitation, you plunge your fingers deep inside her again while Ninel uses her tongue to lap at your swollen clit before slipping it back inside your pussy, flicking her tongue around inside of you. Within seconds, her body shakes and spasms as her juices flow down her inner thighs and drip on your face while she buries her tongue as deeply inside you as it will go.'
+						'You have a feeling of ecstasy so powerful it overwhelms you, leaving you stunned at the sheer intensity of your orgasm. You shout and wither against the almost unbearable pleasure and it goes on and on, seemingly without end. You feel like you''re about to pass out when it almost mercifully passes.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 						gs 'arousal', 'cuni', 10, 'lesbian'
@@ -456,19 +400,18 @@ if $ARGS[0] = 'ninel2':
 						gs 'stat'
 						
 						act 'Lie exhausted':
-							cls
+							*clr & cla
 							minut += 30
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel19.jpg"></center>'
-							'You lay there panting, sweating and exhausted on your bed. Ninel snuggles as the two of you share gentle kiss.'
-							'She looks at you. "Well, how do you feel?"'
-							'Unable to resist grinning. "Ooh... Just perfect" You answer and only then do you realize just how well you do feel. The sickness seems to have passed, leaving you feeling perfectly healthy and in a wonderful mood. The sweet bouquet of sex hangs in the air and the exhaustion makes this an even more pleasant sensations.'
-							'She smiles at you. "Well, It''s magic, baby. Mm-m, you''re just a miracle. For a long time I have not gotten so much pleasure from my magic. If you get sick again, just call me or if you just want to spend time with me. You can also look for me in the clinic.'
-							'You promised to be sure to find her, closing your eyes falling asleep. While you were sleeping, Ninel quietly dressed and left.'
-
+							'You lay panting, sweating and exhausted on your bed. Ninel snuggles as the two of you share a gentle kiss.'
+							'She looks at you. "Well? How do you feel?"'
+							'"Ooohh. Perfect..." you answer and only then do you realize just how well you do feel. The sickness seems to have passed and you feel perfectly healthy, not to mention the wonderful mood you''re suddenly in. The sweet bouquet of sex drifts in the air and the exhaustion makes this an even more pleasant sensation.'
+							'She smiles at you. "Well, It''s magic, baby. Mm-m, you''re just a miracle. I''ve haven''t recieved so much pleasure from my magic in a long time. If you get sick again, just call me. You can also look for me in the clinic if you just want to see me.'
+							'You close your eyes and fall asleep as Ninel quietly gets dressed.'
 							gs 'arousal', 'end'
 							gs 'stat'
 							
-							act 'Sleep':gt 'bedr'
+							act 'Sleep': gt 'bedr'
 						end
 					end
 				end
@@ -478,108 +421,95 @@ if $ARGS[0] = 'ninel2':
 end
 
 if $ARGS[0] = 'ninel3':
-	cls
-	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel20.jpg"></center>'
-	'You lie in bed quietly waiting for Ninel, your fingers rub your pussy, preparing yourself for her visit, so when the doorbell rings your pussy is already soaking wet and ready.'
-
+	'You lie in bed quietly waiting for Ninel, your fingers rubbing your pussy as you prepare yourself for her visit. When the doorbell rings, your pussy is soaking wet and ready.'
 	gs 'arousal', 'clit_finger', 10
 	gs 'stat'
 	
-	act 'Come in it''s open!':
-		cla
-		*clr
+	act 'It''s open!':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel21.jpg"></center>'
-		'When you hear the doorbell you shout. "Come, I mean it''s open!" Wheezing your throat sore, Ninel enters the room.'
-		'"Hi, <<$pcs_nickname>>. Sick again?"'
+		'When you hear the doorbell, you shout "It''s open!" Your throat sore is wheezing as Ninel enters the room.'
+		'"Hello <<$pcs_nickname>>. Sick again?"'
 		'You cough. "Yeah, can you use your magic again?"'
 		'"Sure, baby. Undress and let me examine you."'
-		'"Why? You''re a magician"'
-		'She laughs. "Silly. How could you know this little about magic. I need to know what I need to treat you for, otherwise it will happen as the old song says. Try to make a thunderstorm and get a goat. Magic must be precise."'
-		'"Oh, well ok."'
+		'"Why? You''re a magician."'
+		'She laughs. "Silly. How could you know this little about magic. I need to know what I need to treat you for, otherwise it will happen as the old song says. ''Try to make a thunderstorm and get a goat.'' Magic must be precise."'
+		'"Oh. Okay..."'
 
 		act 'Undress':
-			cls
+			*clr & cla
 			pcs_horny = 75
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel22.jpg"></center>'
-			'You undress and Ninel listens your lungs with her stethoscope. As usual, her hands are light and gentle while touching you. Her stethoscope on your chest while you feel your body flushing with another kind of heat.'
-			'"Yes. Your wheezing again. Is your temperature high as well?"'
-			'You sneeze. "Yes 39.6."'
+			'You undress and Ninel listens your lungs with her stethoscope. As usual, her hands are light and gentle while touching you. You feel your body flushing with heat.'
+			'"You''re wheezing again. Is your temperature high as well?"'
+			'You sneeze. "Yes. 39.6."'
 			'"Oh, you poor thing."'
 			'You start to roll over to let her take your temperature. "The usual?"'
-			'She shakes her head as she smiles at you. "Well, no. You''re far to excited for a rectal reading. We will have to do it orally this time."'
+			'She shakes her head as she smiles at you. "Well, no. You''re far too excited for a rectal reading. We''ll have to do it orally this time."'
 			'You lay back on your back. "Do you have a different one?"'
-			'She holds up an oral thermometer. "You mean like this one?" She places it in your mouth.'
+			'She holds up an oral thermometer. "You mean like this?" she asks before placing it in your mouth.'
 
 			act 'Taking your temperature':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel23.jpg"></center>'
 				'Ninel pulls the thermometer out of your mouth and looks at it, shaking her head.'
-				'"Yes, it''s bad again. Do not worry I can help."'
+				'"Yes, it''s bad again. Don''t worry, I can help."'
 				'She slowly pulls down your blanket.'
 
-				act 'Unbuttoning her dress':
-					cls
+				act 'Unbutton her dress':
+					*clr & cla
 					pcs_horny = 100
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel24.jpg"></center>'
-					'You can no longer hold back, feeling the blanket slide down your naked skin, you reach up and start unbuttoning her dress.'
-					'Her skilful hands glide over your body slowly.'
-					'"Caress me, I''m burning up! I want you so much!" You breathless whisper.'
-					'Instead she stops and grins. "Tell me how much you want me."'
-					'"Ninel, darling, darling, please caress me! Take me, I''m all yours! I beg you! I beg you!"'
+					'You can no longer hold back. Feeling the blanket slide down your naked skin, you reach up and start unbuttoning her dress.'
+					'Her skilful hands glide slowly over your body. "Caress me, I''m burning up! I want you so much!" you breathless whisper.'
+					'Instead, she stops and grins. "Tell me how much you want me."'
+					'"Ninel, please caress me! Take me, I''m all yours! I beg you! I beg you!"'
 					'She just grins at you. "Beg me more!"'
-					'Your eyes tear up at the lack of her touch. "Please, please, please! I beg you, I beg you, please caress me! I''m dying!"'
+					'Your eyes tear up at the lack of her touch. "Please, please, please! I beg you, please caress me! I''m dying!"'
 
 					act 'Beg and plead':
-						cla
-						*clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel25.jpg"></center>'
-						'As you beg and plead Ninel final takes pity on you as she consents to your pleas. Leaning down putting her face between your thighs, her tongue darts out and caresses your clit. You moan in pleasure, a few moments later her tongue skillfully slips inside of you.'
-						'You shriek and moan as the heat waves of your sickness diverge from your body. Your pussy is over flowing, Ninel laps it up like a kitten with a bowl of milk.'
-						'You feel yourself nearing climax, when Ninel suddenly interrupts your blissful moment with a hard voice of command. "Now you will appease me!"'
-
+						'As you beg and plead, Ninel finally takes pity on you and consents to your pleas. Leaning down and putting her face between your thighs, her tongue darts out and caresses your clit. You moan in pleasure as her tongue skilfully slips inside you.'
+						'You shriek and moan as the heat waves of your sickness diverge from your body. Your pussy is overflowing as Ninel laps it up like a kitten with a bowl of milk.'
+						'You feel yourself nearing climax when Ninel suddenly interrupts your blissful moment with a hard voice of command. "Now you will appease me!"'
 						gs 'arousal', 'cuni', 10, 'lesbian'
 						gs 'stat'
-									
+					
 						act 'Ninel takes control':
-							cla
-							*clr
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel26.jpg"></center>'
-							'Ninel lays back on the bed, you crawl over to her and begin to lick her clit. Ninel begins to moan from your tongue lashing you are giving her clit, her pussy oozing out her juices, you eagerly lick up all her juices. As she moans more, she suddenly grabs your hair with her hand and pushes your face into her crotch, your tongue darting inside of her pussy. She grinds you face against her pussy, smearing her juices all over your face and her thighs.'
-							'Ninel moans as she grinds her pussy against your face. "Good, A-ah! Good girl, I''m cuming ah!"'
-
+							'Ninel lays back on the bed as you crawl over to her and start licking her clit. She moans from your tongue lashing you''re giving her clit, her pussy oozing out her juices as you eagerly lap away at it. She then suddenly grabs your hair with her hand and pushes your face into her crotch, your tongue darting inside her pussy as she grinds your face against her crotch, smearing her juices all over your face.'
+							'"Good, A-ah! Good girl. I''m cumming, ah!" she moans loudly.'
 							gs 'arousal', 'cuni_give', 10, 'lesbian'
 							gs 'stat'
-									
+						
 							act '69':
-								cla
-								*clr
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel27.jpg"></center>'
-								'She pulls you up by your hair and turns you around so you can 69 each other. Your tongue eagerly seeks out her pussy as you both being to explore each others pussies with your tongues, both of you moans and gasps, becoming louder and louder.'
-								'You are getting closer and closer to the peak, and Ninel seems too as well, but then she stops again.'
-								'You beg her. "Please, please, go on! I am about to cum!" You caress her insistently, hoping she will relent, but Ninel strongly pulls herself from you.'
+								'She pulls you up by the hair and turns you around so you can 69 each other. Your tongue eagerly seeks out her pussy as you both explore each other''s pussies with your tongues, both of you moaning and gasping louder.'
+								'You''re getting closer to your peak, and Ninel seems too as well, but then she stops again.'
+								'"Please, please, go on!" you beg. "I''m about to cum!" You caress her insistently, hoping she will relent, but she pulls herself away from you.'
 								'"No! I want you to masturbate yourself."'
-
 								gs 'arousal', 'cuni_give', 10, 'lesbian'
 								gs 'arousal', 'cuni', 10, 'lesbian'
 								minut -= 10
 								gs 'stat'
-									
+							
 								act 'Masturbate':
-									cla
-									*clr
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel29.jpg"></center>'
-									'She has you sit on her stomach. With a groan, you obey as you begin to furiously and desperate rub your throbbing pussy. Under you Ninel is doing the same thing. Your pussy is overflowing with its juices, that run down your thighs, down the crack of your ass and onto Ninel''s stomach. The room smells of your juices, languid moans escape both of you as fingers furious work pussies, slowly bringing you to find the peak of bliss again. You scream and squirm in orgasm as does Neiel under you.'
-
+									'She has you sit on her stomach. With a groan, you obey and start furiously and desperately rubbing your throbbing pussy. Ninel is doing the same thing underneath you. The room smells of your juices and lewd moans escape you as you furiously work your pussy, slowly bringing yourself to the peak of bliss again. You scream and squirm in orgasm at the same time as Ninel.'
 									$orgasm_or = 'yes'
 									gs 'arousal', 'clit_finger', 10, 'lesbian'
 									gs 'stat'
 									
 									act 'Lay exhausted':
-										cls
+										*clr & cla
 										minut += 40
 										ninelsex += 1
 										sick = 0
@@ -587,16 +517,15 @@ if $ARGS[0] = 'ninel3':
 										pcs_mood = 100
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sex/ninel28.jpg"></center>'
-										'You lay back against her as her arms come around you, holding you, hugging you tightly to her. Her breath hot against the back of your neck as you pant from exhaustion. Your body slowly recovering from the crushing orgasm.'
-										'You feel completely and totally healthy, but extremely exhausted.'
-										'"Thank you, dear." You say in a whisper.'
-										'"You''re welcome. Come visit me in the clinic sometime.'
-										'You promised to visit her, exhausted reclining on a wet crumpled sheet you fall sleep, Ninel quietly dressed and leaves.'
-
+										'You lay back against her as her arms hold you tightly against her, her breath hot against the back of your neck as you pant from exhaustion.' 
+										'Your body slowly recovers from the crushing orgasm and you feel healthy, but exhausted.'
+										'"Thank you," you whisper.'
+										'"You''re welcome," she replies. "Come visit me in the clinic sometime."'
+										'You promise to visit her and quickly fall asleep as Ninel quietly gets dressed.'
 										gs 'arousal', 'end'
 										gs 'stat'
 										
-										act 'Sleep':gt 'bedr'
+										act 'Sleep': gt 'bedr'
 									end
 								end
 							end

locations/katja_chat.qsrc

@@ -446,7 +446,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 			end
 		elseif katjQW['coffee_hole_rand'] = 3 and npc_rel['A152'] >= 30:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 			'A guy you don''t recognize at first comes into the Coffee Hole. He''s dressed like a character from a medieval movie, wearing a white shirt and tight leather pants. His hair is long and white, though he clearly isn''t old. Most prominently, he appears to have two long swords sheathed on his back.'
 			'He looks around and when he sees you and Katja, he smiles and walks up to you. You look over at Katja, who doesn''t seem to recognize him either. When he reaches your table, you realize that it is Feofan. He''s grown a fair bit of stubble and dyed his hair.'
 			'"Greetings, m''ladies, you smell wonderful at this funeral."'
@@ -483,7 +483,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'npc_relationship', 'modify', 'A152', 'love'			
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"Yennefer is cool, I '+iif(nerdvana_cosplay[149] = 1 , 'actually already have a cosplay outfit.', ' but I would need to get a costume.')+' It would be fun dressings up as her."'
 						'Feofan eyes light up. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
@@ -496,7 +496,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					act 'I would rather be Ciri':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"I think that Ciri is cooler, I '+iif(nerdvana_cosplay[150] = 1 , 'actually already own a Ciri cosplay outfit.', ' but I don''t have a costume.')+' It would be more fun dressing up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters, but you can''t help feel he is a little disappointed by your choice. "Cool, cool, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'npc_relationship', 'modify', 'A152', 'like'			
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"I could dress up as Yennefer.'+iif(nerdvana_cosplay[149] = 1 , ' I actually already have her cosplay outfit.', ' but I would need to get a costume.')+' It would be fun dressing up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'npc_relationship', 'modify', 'A152', 'like'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"I could dress up as Ciri,'+iif(nerdvana_cosplay[150] = 1 , ' I actually already have her cosplay outfit.', ' but I would need to get a costume.')+' It would be more fun dressings up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
@@ -540,7 +540,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					*clr & cla
 					gs 'npc_relationship', 'modify', 'A14', 'like'
 					gs 'npc_relationship', 'modify', 'A152', 'dislike'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 					'"What are you talking about, Feofan?" you ask.'
 					'"You know, Triss'+iif(hotcat > 5, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
 					'"The what?" Katja asks, looking no wiser.' 
@@ -554,7 +554,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				act 'Explain to Katja but tell him you don''t like to cosplay':
 					*clr & cla
 					gs 'npc_relationship', 'modify', 'A152', 'dislike'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 					'"He is talking about characters from a video game," you tell Katja.'
 					'"I knew I could count on you, <<$pcs_nickname>>. So help me convince Katja so we can be the most epic cosplaying team!" Feofan says enthusiastically.'
 					'"No, thanks. I''m not really into that," you tell him, making him look completely devastated.'
@@ -1100,6 +1100,7 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				else
 					KatjaQW['dom'] += 1
+					'"No, I don''t want to," Katja responds in a stern voice. You realize that you won''t convince her otherwise.'
 					act 'Continue talking': gt 'katja_chat', 'coffe_hole_event'
 					act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
 				end

locations/katja_lake.qsrc

@@ -73,11 +73,13 @@ if $ARGS[0] = 'start':
 								'Groaning in frustration, you get naked, as sweet... candid... Katja... get naked, and exaggeratedly sighs giving you sensuall eyes.'
 								'"Bitch!"'
 								'You varelly whisper your insult and take the gigling bimbo wannabe towards the secluded beach.'
-								act 'Swim':
-									gs 'arousal', 'voyeur', 10
-									if pcs_inhib < 20: inhib_exp += 1
-									gs 'clothing', 'strip_all'
-									gt 'katja_lake', 'swim'
+								if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+									act 'Swim':
+										gs 'arousal', 'voyeur', 10
+										if pcs_inhib < 20: inhib_exp += 1
+										gs 'clothing', 'strip_all'
+										gt 'katja_lake', 'swim'
+									end
 								end
 								act 'Tan':
 									gs 'arousal', 'voyeur', 10
@@ -228,7 +230,9 @@ if $ARGS[0] = 'beach_in_swimwear1':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL3.jpg"></center>'
 		'You decide to put on your swimwear, so after making sure that there aren''t any voyeurs, Katja and you, change on your swimwear.'
 
-		act 'Swim': gt 'katja_lake','swim'
+		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+			act 'Swim': gt 'katja_lake','swim'
+		end
 
 		act 'Tan': gt 'katja_lake','tan'
 
@@ -253,7 +257,9 @@ if $ARGS[0] = 'beach_in_swimwear2':
 		'"Bitch!"'
 		'You barely whisper your insult and take the giggling bimbo wannabe towards the secluded beach.'
 
-		act 'Swim': gt 'katja_lake','swim'
+		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+			act 'Swim': gt 'katja_lake','swim'
+		end
 
 		act 'Tan': gt 'katja_lake','tan'
 
@@ -629,7 +635,9 @@ if $ARGS[0] = 'beach_nude':
 	minut += 10
 	gs 'stat'
 
-	act 'Swim': gt 'katja_lake','swim'
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Swim': gt 'katja_lake','swim'
+	end
 	act 'Tan':  gt 'katja_lake','tan'
 	act 'Walk': gt 'katja_lake','walk'
 end
@@ -639,7 +647,6 @@ if $ARGS[0] = 'swim':
 	*clr & cla
 	menu_off = 1
 	if $clothingworntype = 'nude' and katjaQW['slut'] <= 20: katjaQW['slut'] += 5
-	minut += 30
 	npc_rel['A14'] += 1
 	katjaQW['horny'] += 5
 	pcs_mood += 10
@@ -647,7 +654,7 @@ if $ARGS[0] = 'swim':
 	cumspclnt = 4 & gs 'cum_cleanup'
 
 	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-	if pcs_stren < 30: gs 'exp_gain', 'stren', 1
+	gs 'exercise', 'tier1', 30, 'stren'
 	fat -= 1
 	if $clothingworntype = 'nude' and pcs_inhib < 20: inhib_exp += rand(1,2)
 
@@ -719,7 +726,9 @@ if $ARGS[0] = 'tan':
 	pcs_tan = pcs_tan + 3
 	gs 'stat'
 
-	act 'Swim': gt 'katja_lake','swim'
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Swim': gt 'katja_lake','swim'
+	end
 	act 'Walk': gt 'katja_lake','walk'
 	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 end
@@ -756,7 +765,9 @@ if $ARGS[0] = 'walk':
 	pcs_mood += 10
 	gs 'stat'
 
-	act 'Swim': gt 'katja_lake','swim'
+	if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+		act 'Swim': gt 'katja_lake','swim'
+	end
 	act 'Tan': gt 'katja_lake','tan'
 	act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 end
@@ -794,7 +805,9 @@ if $ARGS[0] = 'ivan_appeared':
 
 			act 'Redress and look for something else to do': gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 
-			act 'Swim': gt 'katja_lake','swim'
+			if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+				act 'Swim': gt 'katja_lake','swim'
+			end
 			act 'Tan': gt 'katja_lake','tan'
 			act 'Walk': gt 'katja_lake','walk'
 		end
@@ -888,7 +901,9 @@ if $ARGS[0] = 'ivan_interaction':
 			'You blink. Ivan''s words take you by surprise and before you or Katja can say something, he quickly returns to the lake. Time to look for something else to do.'			
 		end
 
-		act 'Swim':gt 'katja_lake','swim'
+		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+			act 'Swim':gt 'katja_lake','swim'
+		end
 		act 'Tan':gt 'katja_lake','tan'
 		act 'Walk':gt 'katja_lake','walk'
 		act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'

locations/korr.qsrc

@@ -58,12 +58,12 @@ act '<b>Go to the street</b>':
 	end
 end
 
-act 'Go to the bedroom':gt 'bedr'
-act 'Go to the bathroom':gt 'vanr'
-act 'Go to the kitchen':gt 'kuhr'
-act 'Go to the living room':gt 'sitr'
+act 'Go to the bedroom': gt 'bedr'
+act 'Go to the bathroom': gt 'vanr'
+act 'Go to the kitchen': gt 'kuhr'
+act 'Go to the living room': gt 'sitr'
 if func('homes_properties', 'is_current_home') = 0:
-	act 'Set this apartment as your main home':gs 'homes_properties', 'set_home' & gt 'korr'
+	act 'Set this apartment as your main home': gs 'homes_properties', 'set_home' & gt 'korr'
 else
 	if $status['dog'] ! 'blocked' and menu_off = 0 and rex['owned'] = 1:
 		if rex['status'] = 0:
@@ -94,10 +94,10 @@ if ParrotQW['Owned1'] = 1:'Your parrot <a href="exec:gt ''popu'', ''start''"><<$
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
 	parkday = daystart
-	'A heavy envelope has arrived in the mail. When you open it, you''re horrified to find several pictures of you giving blowjobs to the guys in the park inside.'
-	'A small note accompanying them says:'
-	'If you don''t want these pictures to be posted on your door and sent to your work place, then come to this address.'
-	'PS, if you don''t come today, these pictures will be hanging in your stairwell tomorrow.'
+	'A heavy envelope has arrived in the mail. When you open it, you''re horrified to find several pictures of you giving blowjobs to the guys in the park inside. A small note accompanying them says:'
+	*nl
+	'"If you don''t want these pictures to be posted on your door and sent to your work place, then come to this address. PS, if you don''t come today, these pictures will be hanging in your stairwell tomorrow."'
+	*nl
 	'You check the address and find that it''s Aphrodite Photography in the City Center.'
 elseif parkday ! daystart and parkblackmail = 2:
 	parkblackmail = 0
@@ -105,7 +105,7 @@ elseif parkday ! daystart and parkblackmail = 2:
 	'You''re horrifed and embarrassed when you see photos of you with your face covered in cum with two dicks in your mouth covering your stairwell walls.'
 end
 
-!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+!!if rand (0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
 
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color="red">, the doorbell rings</font></b>'
@@ -122,7 +122,7 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 			gs 'stat'
 			'You open the door and Grisha smiles. "I thought you were hiding from me. So, do you have my money?" You nod and pay him the money you owe.'
 
-			act 'Close the door':gt $curloc
+			act 'Close the door': gt $curloc
 		end
 	end
 end
@@ -212,7 +212,7 @@ if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and
 				gs 'stat'
 				'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
 
-				act 'Go with him':gt 'kameraKPZ'
+				act 'Go with him': gt 'kameraKPZ'
 			end
 
 			act 'Tell the truth':
@@ -221,7 +221,7 @@ if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and
 				gs 'stat'
 				'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
 
-				act 'Go with him':gt 'kameraKPZ'
+				act 'Go with him': gt 'kameraKPZ'
 			end
 		end
 	end
@@ -236,13 +236,11 @@ end
 if sick > 0 and doktorday ! daystart:
 
 	!!act 'Call a doctor':
-	!!	cla
-	!!	*clr
+	!!	*clr & cla
 	!!	minut += 15
 	!!	doktorday = daystart
 	!!	sick -= 5
-
-	!!	if sick < 1:sick = 1
+!!	if sick < 1:sick = 1
 	!!	if sickstage = 1:sicktimer += 5
 
 	!!	'A doctor arrives from the clinic and examines you. After the examination, the doctor gives a shot and you start feeling better.'
@@ -254,95 +252,76 @@ if sick > 0 and doktorday ! daystart:
 end
 
 $ninel0 = {
-	cla
-	*clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel00.jpg"></center>'
-	'You open the door. Standing on the threshold is a pretty young girl with a medical bag in her hand.'
-	'"Hello, my name is Ninel. I do the home visits for the clinic. Where is the patient?"'
+	'You open the door and see a pretty young girl with a medical bag in her hand standing on the threshold.'
+	'"Hello, my name is Ninel Pavlovna. I do the home visits for the clinic. Where is the patient?"'
 	'"That would be me..."'
 	'"I see. First, we need to get you back into bed."'
 
-	act 'Follow the doctor in the bedroom and lay down':
-		cla
-		*clr
+	act 'Go back to bed':
+		*clr & cla
 		ninelmet = 1
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom0.jpg"></center>'
-		'The doctor sits on the edge of your bed and checks your forehead.'
-		'"What are your symptoms <<$pcs_nickname>>? Can I call you that?"'
-		'"Of course..." You start to answer but end up coughing. "Sorry. I have a high fever, a sore throat and a cough that''s killing me!"'
+		'Ninel sits on the edge of your bed and checks your forehead.'
+		'"What are your symptoms, <<$pcs_nickname>>? Can I call you that?"'
+		'"Of course..." You start to answer, but end up coughing. "Sorry. I have a high fever, a sore throat and a cough that''s killing me!"'
 		'"Running nose? Headaches? Aching bones?"'
 		'"Yes, all of them."'
-		'"Well, take your clothes off so I can examine you."'
+		'"Please take your clothes off so I can examine you."'
 
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			pcs_horny += 10
-			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom1.jpg"></center>'
-			'You undress and the doctor listens to your lungs for a long time. Her hands are cool and gentle as she touches you, while the stethoscope is cold.'
-			'"Mmmm, now let''s take a look at your mouth. Open wide and say Aaah."'
+			'You undress and Ninel listens to your lungs for a long time. Her hands are cool and gentle as she touches you, while the stethoscope is cold.'
+			'"Mmmm, now let''s take a look at your mouth. Open wide and say ''aah''."'
 
 			act 'Ahh':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel03.jpg"></center>'
-				'You open your mouth and the doctor looks in, examining your sore throat'
+				'You open your mouth and she looks in, examining your sore throat.'
 				'"I see. Your throat is very red and inflamed. Now we need to take your temperature.'
 
 				act 'Put a thermometer in your mouth':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/ninel04.jpg"></center>'
-					'"No, not like that. The temperature needs to be measured rectally.'
+					'"No, not like that. The temperature needs to be measured rectally."'
 					'"What...?"'
 					'"It''s more precise. Don''t be afraid, it''s not painful."'
 					'"Well if I have to..."'
 					'"It''s necessary. Come on, lie down on your stomach and spread your buttocks with your hands please."'
 
 					act 'Change position':
-						cla
-						*clr
-						clr
-						gs 'stat'
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom2.jpg"></center>'
-						'You obediently roll over and offer your ass. The doctor lubricates your anus with some vaseline and deftly introduces the thermometer. You flinch, not from pain but pleasure. The doctor doesn''t just stick the thermometer in your ass, but slowly moves it back and forth. It''s very nice and you feel your excitement growing.'
-
+						'You obediently roll over and spread your ass as Ninel lubricates your anus with some vaseline and deftly introduces the thermometer. You flinch, not from pain but pleasure. The doctor doesn''t just stick the thermometer in your ass, but slowly moves it back and forth. It''s very nice and you feel your excitement growing.'
 						gs 'arousal', 'anal_dildo', 10
 						gs 'stat'
 
 						if pcs_horny >= 50:
-							act 'Moan with pleasure':
-								cla
-								*clr
+							act 'Moan in pleasure':
+								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
 								'The doctor takes the thermometer out of your ass and checks it.'
-								'"39.2. Very bad. Please turn on your back, I need to palpate the lymph nodes.'
+								'"39.2. Very bad. Please turn on your back, I need to palpate the lymph nodes."'
 
 								act 'Roll over on your back':
-									cla
-									*clr
-									clr
-									gs 'stat'
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom5.jpg"></center>'
 									'The doctor begins to stroke and knead your stomach and thighs. You''re not actually sure if this is a real medical procedure. She does it for far too long, but it''s too pleasant and you don''t object.'
 									'Your excitement continues to grow and you feel your pussy moistening as you start to moan softly.'
-
 									gs 'arousal', 'foreplay', 15
 									gs 'stat'
 
 									act 'Blush in embarrassment':
-										cla
-										*clr
-										clr
-
-										gs 'stat'
+										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom6.jpg"></center>'
-										'You blush with embarrassment, but then fall below the hands of the doctor and she begins to caress your pussy'
+										'You blush with embarrassment, but then fall below the hands of Ninel as she starts caressing your pussy.'
 										'"Doctor, what are you doing!" you scream, feeling embarrassed, outraged and frightened.'
-										'"I feel the magic in you, which means you''re one of us, and I can use his power quietly." she replies.'
+										'"I feel the magic in you, which means you''re one of us, and I can use my healing powers on you," she replies.'
 										'"So you''re a succubus too?!"'
 										'"Yes, but only with a special kind of magic. Tantric. Have you heard of it?'
 										'"No, I don''t think so..."'
@@ -350,9 +329,8 @@ $ninel0 = {
 										'"So...?"'
 										'"That is, if I have sex with you, I will heal you. So? Do you agree?"'
 										'"And what should I do in return?"'
-										'"Nothing. I''m doing it solely for my own satisfaction. I will see that you only have orgasms if conjured."'
+										'"Nothing. I''m doing it solely for my own satisfaction."'
 										'"Then of course I agree."'
-
 										gs 'arousal', 'foreplay', 15
 										gs 'stat'
 
@@ -363,32 +341,29 @@ $ninel0 = {
 						end
 
 						act 'Indignant':
-							cla
-							*clr
+							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom3.jpg"></center>'
-							'"Doctor, what the hell are you doing?" you squeal.'
-							'She takes the thermometer out of your ass and calmly replies. "I''m measuring your temperature. 39.2, very bad."'
+							'"What the hell are you doing?!" you squeal.'
+							'She takes the thermometer out of your ass. "I''m measuring your temperature. 39.2. Very bad," she calmly replies.'
 
 							act 'What''s wrong with me?':
 								cla
 								'"Doctor, what''s wrong with me?" you ask, somewhat scared.'
-								'"You have a really bad flu, but I''ll make you an injection of antibiotics and antigens. You will soon feel better."'
+								'"You have a really bad flu, but I''ll make you an injection of antibiotics and antigens and you''ll soon feel better."'
 
 								act 'Get injection':
-									cla
-									*clr
+									*clr & cla
 									minut += 10
 									sick -= 2
 									lekar += 3
-									clr
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom4.jpg"></center>'
-									'The doctor jabs the needle into one of your ass cheeks and injects the contents. You whimper slightly.'
+									'You whimper slightly as Ninel jabs the needle into one of your ass cheeks and injects the contents.'
 									'"That''s about everything. You have to rest in bed, drink hot drinks, take antibiotics and nose drops and stay on a balanced diet. When your temperature drops, come to the clinic to see me."'
 									'"Thank you, Doctor, I''ll follow your instructions."'
-									'The doctor says goodbye and leaves.'
+									'Ninel smiles and says goodbye before leaving.'
 
-									act 'Back to bed':gt 'bedr'
+									act 'Back to bed': gt 'bedr'
 								end
 							end
 						end
@@ -396,39 +371,35 @@ $ninel0 = {
 						act 'What''s wrong with me?':
 							cla
 							'"Doctor, what''s wrong with me?" you ask fearfully.'
-							'"I''m afraid you have angina, <<$pcs_nickname>>. I would advise you recieve immediate treatment." she replies.'
-							'"What''s that?! You mean, in the hospital?" you shriek.'
-							'"Yes, at the clinic." she calmly replies.'
+							'"I''m afraid you have angina, <<$pcs_nickname>>. I would advise you recieve immediate treatment," she replies.'
+							'"What? You mean in the hospital?!" you shriek.'
+							'"Yes, at the clinic," she calmly replies.'
 
 							act 'Refuse':
-								cla
-								*clr
-								'"Doctor, I can''t go to the hospital!"'
-								'She smiles at you. "Well... I guess we could do it a different way then. I''ll give you a few shots to start with.'
+								*clr & cla
+								'"I can''t go to the hospital!"'
+								'She smiles at you. "Well... I guess we could do it a different way then. I''ll give you a few shots to start with."'
 								'"Oh thank you, doctor!"'
 
 								act 'Lie on your stomach and bare your ass':
-									cla
-									clr
-									gs 'stat'
+									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/nadom9.jpg"></center>'
-									'The doctor jabs a needle into your ass cheek and then pats your ass a few times. You suddenly develop an incredible sexual arousal, as if a fire has started between your thighs. Your pussy burns and drips, your breath gets heavy and your nipples harden.'
+									'The doctor jabs a needle into your ass cheek and you find yourself suddenly becoming incredibly aroused, your pussy growing wet and aching to be invaded as your breath quickens and your nipples grow hard with desire.'
 									'"Doctor, what''s happening?" you ask, almost screaming. You feel embarrassed and frightened, but your voice breaks, betraying your arousal, and you moan voluptuously.'
-									'"I knew it! I can feel the magic in you, which means you''re one of us, and I can use my power quietly."'
+									'"I knew it! I can feel the magic in you, which means you''re one of us, and I can use my healing powers on you."'
 									'"So you''re a succubus too?!"'
 									'"Yes, but only with a special kind of magic. Tantric. Have you heard of it?"'
 									'"No, I don''t think so..."'
 									'"It''s based on sensuality and sex, roughly speaking, I can cast spells only while having sex."'
 									'"So...?"'
-									'"That''s it. If we have sex, I will heal you. Do you agree?!'
+									'"That''s it. If we have sex, I will heal you. Do you agree?"'
 									'"And what should I do in return?"'
-									'"Nothing. I''m doing it solely for my own satisfaction. I''ll see that you only have orgasms if conjured.'
-									'"Then of course I agree."'
-
+									'"Nothing. I''m doing it solely for my own satisfaction."'
+									'"Then I agree."'
 									gs 'arousal', 'foreplay', 15
 									gs 'stat'
 
-									act 'Surrender to the gentle touch of Ninel':gt 'housecall', 'ninel2'
+									act 'Surrender to the gentle touch of Ninel': gt 'housecall', 'ninel2'
 								end
 							end
 						end
@@ -442,62 +413,56 @@ $ninel0 = {
 $drPP = {
 	cla
 	*clr
-	'You answer the door. On the threshold is an older, balding man with a medical bag in his hand.'
+	'You answer the door and an older, balding man with a medical bag in his hand is standing on the threshold.'
 	'"Hello, doctor."'
-	'"Hello, dear. I''m the local doctor. Now please go back to bed and don''t stand in this cold air.'
+	'"Hello, dear. I''m the local doctor. Now please go back to bed and don''t stand in this cold air."'
 
 	act 'Go back to bed':
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp1.jpg"></center>'
 		'You walk back to the bedroom with the doctor. He sits on the edge of the bed and feels your forehead.'
 		'"So Miss <<$pcs_lastname>>. What are your symptoms?'
-		'"Ahem, ahem... Well, Doctor, I have a sore throat - very sore actually - and a high temperature."'
+		'"Ahem... I have a sore throat - very sore actually - and a high temperature."'
 		'"And a nasty cough too I see. And judging by your voice, also a running nose."'
 		'"Yes... Aachoo!!"'
-		'"Miss <<$pcs_lastname>>, please remove your clothes so I can examine you."'
+		'"Please remove your clothes so I can examine you."'
 
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
-			clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp2.jpg"></center>'
 			'You undress and the doctor listens to your lungs for a while.'
-			'"Now let''s take a look at your throat. Open your mouth wide and say Aahh."'
+			'"Now let''s take a look at your throat. Open your mouth wide and say ''ahh''."'
 
 			act 'Aahh':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp3.jpg"></center>'
 				'You open your mouth and the doctor looks in.'
 				'"Mmmm, I see. Well, let''s take your temperature."'
 
 				act 'Put the thermometer under your armpit':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp4.jpg"></center>'
 					'The doctor waits a few minutes, then looks at the thermometer and shakes his head.'
 
 					act 'What''s wrong with me?':
 						cla
-						'"You have the flu." he calmly replies. "Nothing too serious, I''ll just give you an injection and you''ll feel better soon. Stay in bed, drink plenty of fluids and try to rest as much as possible. When you feel better come to the clinic. Now please roll over so I can give you the injection."'
+						'"You have the flu," he calmly replies. "Nothing too serious, I''ll just give you an injection and you''ll feel better soon. Stay in bed, drink plenty of fluids and try to rest as much as possible. Now please roll over so I can give you the injection."'
 
 						act 'Roll over and lay on your stomach':
-							cla
-							*clr
+							*clr & cla
 							minut += 10
 							sick -= 2
 							lekarstvo += 3
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp5.jpg"></center>'
-							'The doctor jabs a needle into your ass and injects the contents.'
-							'"Now remember. Stay in bed, drink lots of fluids and try to rest. When you feel better come by the clinic."'
+							'You whimper slightly as the doctor jabs a needle into your ass and injects the contents.'
+							'"Now remember. Stay in bed, drink lots of fluids and try to rest. When you feel better, come by the clinic."'
 							'"Thank you, Doctor, I will."'
-							'You escort the doctor back to the entrace where he says goodbye and leaves. After shutting the door, you head back to bed.'
+							'You escort the doctor back to the entrance where he says goodbye and leaves. After shutting the door, you head back to bed.'
 
-							act 'Go back to bed':gt 'bedr'
+							act 'Go back to bed': gt 'bedr'
 						end
 					end
 				end
@@ -525,42 +490,40 @@ $polidin = {
 
 			act 'Give your address':
 				cla
-				'You have a coughing fit before you''re able to answer. "Sorry, it''s <<$pcs_firstname>> <<$pcs_lastname>>. Street Park House 4, apartment 69." you manage before sneezing.'
-				'"One moment please." she responds before she puts you on hold.'
+				'You have a coughing fit before you''re able to answer. "Sorry, it''s <<$pcs_firstname>> <<$pcs_lastname>>. Street Park House 4, apartment 69," you manage before sneezing.'
+				'"One moment please," she responds before she puts you on hold.'
 
 				act 'Wait':
 					cla
 					minut += 5
-					clr
 					gs 'stat'
 					'You wait for five minutes, occasionally coughing and sneezing, until she finally returns. "So Miss <<$pcs_lastname>>, what are your symptoms?"'
-					'You start to answer but end up coughing. "Sorry, I have a fever, sore throat, a cough and a runny nose."'
+					'You start to answer, but end up coughing. "Sorry. I have a fever, sore throat, a cough and a runny nose."'
 					'"Is your temperature high?"'
-					'"Yes, quite so, 39.2°C." you tell her, followed by a sneeze.'
+					'"Yes, quite so. 39.2°C," you tell her, followed by a sneeze.'
 					'"Very well. A doctor will come see you at home."'
 					'"How soon?"'
-					'"As soon as one is free." she answers. "Yours isn''t an isolated case."'
-					'"Thank you." you respond and hang up.'
+					'"As soon as one is free," she answers. "Yours isn''t an isolated case."'
+					'"Thank you," you respond and hang up.'
 
 					if ninelsex = 1:
 						act 'Is Ninel available?':
 							cla
-							'"Is Doctor Pavlovna available? She is my regular doctor."'
+							'"Is Doctor Pavlovna available? She''s my regular doctor."'
 							'"Let me check." The nurse puts you on hold for a few minutes before returning. "Yes, she is free and will make the house call."'
-							'"Once again, thank you very much." you reply and hang up.'
+							'"Once again, thank you very much," you reply and hang up.'
 
-							act 'Continue':gt 'housecall', 'ninel3'
+							act 'Continue': gt 'housecall', 'ninel3'
 						end
 					end
 
 					act 'Go back to bed':
-						cla
-						*clr
+						*clr & cla
 						picrand = rand(21, 27)
 						'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick<<picrand>>.jpg"></center>'
 						timerand = rand(1, 6)
 						minut += timerand * 30
-						'You lie in bed, shivering while wrapped in a blanket. Time drags by painfully slow. You can''t say how much time passes before the doorbell rings.'
+						'You lie in bed, shivering while wrapped in a blanket. Time drags by painfully slow and you can''t say how much time passes before the doorbell rings.'
 
 						! WD: Uninitialised ~ 'ninel' use 'ninelmet'
 						act 'Answer the door':
@@ -569,8 +532,8 @@ $polidin = {
 							elseif ninelmet = 0 or sick > 50:
 								doctrnd = rand(0, 1)
 
-								if doctrnd = 0:dynamic $drPP
-								if doctrnd = 1:gt 'housecall', 'ninel0'
+								if doctrnd = 0: dynamic $drPP
+								if doctrnd = 1: gt 'housecall', 'ninel0'
 							end
 						end
 					end

locations/korr2x.qsrc

@@ -37,10 +37,10 @@ if ParrotQW['Owned1'] = 1:'Your parrot <a href="exec:gt ''popu'', ''start''"><<$
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
 	parkday = daystart
-	'A heavy envelope has arrived in the mail. When you open it, you''re horrified to find several pictures of you giving blowjobs to the guys in the park inside.'
-	'A small note accompanying them says:'
-	'"If you don''t want these pictures to be posted on your door and sent to your work place, then come to this address."'
-	'"PS, if you don''t come today, these pictures will be hanging in your stairwell tomorrow."'
+	'A heavy envelope has arrived in the mail. When you open it, you''re horrified to find several pictures of you giving blowjobs to the guys in the park inside. A small note accompanying them says:'
+	*nl
+	'"If you don''t want these pictures to be posted on your door and sent to your work place, then come to this address. If you don''t come today, these pictures will be hanging in your stairwell tomorrow."'
+	*nl
 	'You check the address and find that it''s Aphrodite Photography in the City Center.'
 elseif parkday ! daystart and parkblackmail = 2:
 	parkblackmail = 0
@@ -48,20 +48,12 @@ elseif parkday ! daystart and parkblackmail = 2:
 	'You''re horrifed and embarrassed when you see photos of you with your face covered in cum with two dicks in your mouth covering your stairwell walls.'
 end
 
-act 'Go to the Bedroom':
-	gt'bedr2x'
-end
-act 'Go to the Bathroom':
-	gt'vanr2x'
-end
-act 'Go to the Kitchen':
-	gt'kuhr2x'
-end
-act 'Go to the Living Room':
-	gt'sitr2x'
-end
+act 'Go to the bedroom': gt'bedr2x'
+act 'Go to the bathroom': gt'vanr2x'
+act 'Go to the kitchen': gt'kuhr2x'
+act 'Go to the living room': gt'sitr2x'
 act '<b><font color="maroon">Go outside</font></b>':
-	cls
+	cla
 	if $clothingworntype = 'nude':
 		'<b><font color="red">You need to get dressed before going out.</font></b>'
 		xgt $curloc
@@ -77,14 +69,14 @@ end
 if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color = red>The doorbell rings</font></b>'
 	act 'Answer the door':
-		cls
-		gs'stat'
+		cla
+		gs 'stat'
 		'You go to the door and look through the peephole to see a dark male figure. "It''s me. Grisha, the plumber. You owe me some money, remember?" he says through the door.'
 		act 'Open the door':
-			cls
+			cla
 			money -= santehnikDolg
 			santehnikDolg = 0
-			gs'stat'
+			gs 'stat'
 			'You open the door and Grisha smiles. "I thought you were hiding from me. So, do you have my money?" You nod and pay him the money you owe.'
 			act 'Close the door':gt $curloc
 		end
@@ -124,9 +116,9 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 		year += 5
 		age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 		money = 2000
-		'The police arrive and take you to court. After standing trial, you are given five years of jail time and are required to pay your debt of <<DolgRS>>.'
+		'The police arrive and take you to court. After standing trial, you''re given five years of jail time and are required to pay your debt of <<DolgRS>>.'
 		act 'Serve your time':
-			cls
+			cla
 			srok_kolvo = 1
 			srok_otsidki += 5
 			salo = 10
@@ -155,9 +147,9 @@ if BurgerQW['IlyQW']  = 3 and hour >= 9 and hour <= 20:
 			preg = 0
 			young_shop_work = 0
 			gs 'uniutil', 'student', 'unenroll'
-			gs'stat'
-			'Time drags on slowly. Your life and work are tedious and monotonous. You''ve been sewing for five years, having meals in the dining room and going to sleep surrounded by other female inmates. 1,000 <b>₽</b> of your 2,000 <b>₽</b> per month salary goes towards your debt repayment.' 
-			'As slow as it seems, time doesn''t stand still and your torment finally comes to an end. You are released and given 2,000 <b>₽</b>. You board the train and return to the city.'
+			gs 'stat'
+			'Time drags on slowly. Your life and work are tedious and monotonous. You sew, have meals in the dining room and go to sleep surrounded by other female inmates. 1,000 <b>₽</b> of your 2,000 <b>₽</b> per month salary goes towards your debt repayment.' 
+			'As slow as it seems, time doesn''t stand still and your torment finally comes to an end. You''re released and given 2,000 <b>₽</b>. You board the train and return to the city.'
 			act 'Get off the train': gt 'city_industrial_train', 'outside'
 		end
 	end
@@ -166,92 +158,86 @@ end
 if BurgerQW['IlyQWDay'] ! daystart and BurgerQW['IlyQW']  = 1 and hour >= 8 and hour <= 20:
 	'<b><font color = red>The doorbell rings</font></b>'
 	act 'Answer the door':
-		cls
-		gs'stat'
+		cla
+		gs 'stat'
 		'You walk up to the door and look through the peephole. You see a few men, and even in the dark, you recognize them from their caps. "<<$pcs_firstname>> <<$pcs_lastname>>! This is the police, open up!"'
 		act 'Open the door':
-			cls
+			cla
 			minut += 120
 			BurgerQW['IlyQW']  = 2
-			gs'stat'
-			'You open the door, wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny man with with a weeks worth of stubble and a pistol in a holster slung under his armpit speaks to you. "Please take a seat while we search the apartment. This is a warrant for your arrest and this is a search warrant for your apartment. You can read them." The men start searching your apartment and a few minutes later, one of them reappears. "Here are the keys. According to the description, these look like the keys to the office and the safe where the money was stolen." The detective frowns at you and nods to the officer, who pulls your hands behind your back and snaps the handcuffs around your wrists.'
+			gs 'stat'
+			'You open the door, wondering what they want from you. There are several men in uniform and others in civilian clothes. A lean and skinny man with with a weeks worth of stubble and a pistol in a holster slung under his armpit speaks to you. "Please take a seat while we search the apartment. This is a warrant for your arrest and this is a search warrant for your apartment. You can read them." The men start searching your apartment and a few minutes later, one of them reappears. "Here are the keys. According to the description, these look like the keys to the office and the safe where the money was stolen." The detective frowns at you and nods at the officer, who pulls your hands behind your back and snaps the handcuffs around your wrists.'
 			wait 1500
-			'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and entering the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
-			'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up to you with gloomy eyes and says "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
+			'You''re escorted out of the building in handcuffs and pushed into a police car. After the door slams shut, the car starts up and drives through the city streets until it stops outside the police station and you''re pulled out and brought into an interview room where the dectective is waiting for you. He takes the handcuffs off you and offers you a seat. You sit in a hard and uncomfortable chair while the detective turns the TV on and inserts a video tape. On the screen is footage from a security camera in Bystroeshke showing you appear in the corridor and enter the office before exiting a few minutes later holding a thick envelope. The detective takes the tape out and inserts another one.' 
+			'It shows Chubais'' office. The door opens and you walk in holding some keys. You go to the safe, open it with one of the keys and take the envelope with <<$BurgerQW[''IlySecurityCamDesc'']>> written on it. The detective turns the TV off, picks up a plastic bag with the keys inside and finally speaks. "Tests prove that the keys found in your apartment are those to the office and the safe of Bystroezhki. The tapes from the surveillance cameras clearly show you entering the office and taking 650,000 rubles." He takes out a pen and paper and begins to write. While writing, he looks up at you with gloomy eyes. "A confession will help you in the court. Since this is a first time offense and provided you return the money, you may be given a suspended sentence if you admit your guilt."'
 			act 'Sign the confession':
-				cls
+				cla
 				minut += 60
-				gs'stat'
+				gs 'stat'
 				'You sign the confession and the detective signals for an officer, who enters the room as the detective nods in your direction. "Take her."'
-				act 'Go with him':gt'kameraKPZ'
+				act 'Go with him': gt'kameraKPZ'
 			end
 			act 'Tell the truth':
-				cls
+				cla
 				minut += 60
-				gs'stat'
+				gs 'stat'
 				'You tell the detective what actually happened and how Ilyushkin framed you, but he barely listens to you before he slams his fist on the table and yells at you. "I wasn''t born yesterday! If you will not cooperate, you''ll rot in prison!" An officer then enters the room and the detective nods in your direction. "Take her."'
-				act 'Go with him':gt'kameraKPZ'
+				act 'Go with him': gt'kameraKPZ'
 			end
 		end
 	end
 	exit
 end
-if gopstop > 30: gt'police','1'
+if gopstop > 30: gt 'police','1'
 
-if sick > 0 and doktorday ! daystart: act 'Call a doctor':doktorday = daystart & dynamic $polidin
+if sick > 0 and doktorday ! daystart: act 'Call a doctor': doktorday = daystart & dynamic $polidin
 
 $drPP = {
-	cla
-	*clr
+	*clr & cla
 	'You answer the door. On the threshold is an older, balding man with a medical bag in his hand.'
 	'"Hello, doctor."'
 	'"Hello, dear. I''m the local doctor. Now please go back to bed and don''t stand in this cold air.'
 	act 'Go back to bed':
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp1.jpg"></center>'
 		'You walk back to the bedroom with the doctor. He sits on the edge of the bed and feels your forehead.'
 		'"So Miss <<$pcs_lastname>>. What are your symptoms?'
-		'"Ahem, ahem... Well, Doctor, I have a sore throat - very sore actually - and a high temperature."'
+		'"Ahem, ahem... Well, Doctor, I have a sore throat - very sore actually - and a high temperature," you reply.'
 		'"And a nasty cough too I see. And judging by your voice, also a running nose."'
 		'"Yes... Aachoo!!"'
-		'"Miss <<$pcs_lastname>>, please remove your clothes so I can examine you."'
+		'"Please remove your clothes so I can examine you," he orders.'
 		act 'Undress':
-			cla
-			*clr
+			*clr & cla
 			minut += 5
 			clr
-			gs'stat'
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp2.jpg"></center>'
 			'You undress and the doctor listens to your lungs for a while.'
-			'"Now let''s take a look at your throat. Open your mouth wide and say Aahh."'
+			'"Now let''s take a look at your throat. Open your mouth wide and say ''aahh''."'
 			act 'Ahh':
-				cla
-				*clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp3.jpg"></center>'
 				'You open your mouth and the doctor looks in.'
-				'"Mmmm, I see. Well, let''s take your temperature."'
+				'"Mmmm, I see. Let''s take your temperature."'
 				act 'Put the thermometer under your armpit':
-					cla
-					*clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp4.jpg"></center>'
 					'The doctor waits a few minutes, then looks at the thermometer and shakes his head.'
 					act 'What''s wrong with me?':
 						cla
-						'You have the flu." he calmly replies. "Nothing too serious, I''ll just give you an injection and you''ll feel better soon. Stay in bed, drink plenty of fluids and try to rest as much as possible. When you feel better come to the clinic. Now please roll over so I can give you the injection."'
+						'You have the flu," he calmly replies. "Nothing too serious, I''ll just give you an injection and you''ll feel better soon. Stay in bed, drink plenty of fluids and try to rest as much as possible. When you feel better, come to the clinic. Now please roll over so I can give you the injection."'
 						act 'Roll over':
-							cla
-							*clr
+							*clr & cla
 							minut += 10
-							sick = sick - 2
+							sick - 2
 							lekarstvo += 3
-							gs'stat'
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/drpp5.jpg"></center>'
 							'The doctor jabs a needle into your ass and injects the contents.'
 							'"Now remember. Stay in bed, drink lots of fluids and try to rest. When you feel better come by the clinic."'
-							'"Thank you, Doctor, I will."'
-							'You escort the doctor back to the entrace where he says goodbye and leaves. After shutting the door, you head back to bed.'
-							act 'Go back to bed':gt'bedr2x'
+							'"Thank you Doctor, I will."'
+							'You escort the doctor back to the entrance, where he says goodbye and leaves. After shutting the door, you head back to bed.'
+							act 'Go back to bed': gt'bedr2x'
 						end
 					end
 				end
@@ -261,10 +247,10 @@ $drPP = {
 }
 
 $polidin = {
-	cla
-	*clr
-	minut = minut + 15
-	callrand = RAND(0,2)
+	*clr & cla
+	minut + 15
+	gs 'stat'
+	callrand = rand(0,2)
 	if callrand = 0:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/housecall.jpg"></center>'
 	if callrand = 1:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/housecall.jpg"></center>'
 	if callrand = 2:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/housecall.jpg"></center>'
@@ -278,34 +264,32 @@ $polidin = {
 			'"Your name and address, please?" she asks.'
 			act 'Give your address':
 				cla
-				'You have a coughing fit before you''re able to answer. "Sorry, it''s <<$pcs_firstname>> <<$pcs_lastname>>. Street Park House 4, apartment 69." you manage before sneezing.'
-				'"One moment please." she responds before she puts you on hold.'
+				'You have a coughing fit before you''re able to answer. "Sorry, it''s <<$pcs_firstname>> <<$pcs_lastname>>. Street Park House 4, apartment 69," you manage before sneezing.'
+				'"One moment please," she responds before she puts you on hold.'
 				act 'Wait':
 					cla
-					minut = minut + 5
-					clr
-					gs'stat'
+					minut += 5
+					gs 'stat'
 					'You wait for five minutes, occasionally coughing and sneezing, until she finally returns. "So Miss <<$pcs_lastname>>, what are your symptoms?"'
-					'You start to answer but end up coughing. "Sorry, I have a fever, sore throat, a cough and a runny nose."'
+					'You start to answer, but end up coughing. "Sorry, I have a fever, sore throat, a cough and a runny nose."'
 					'"Is your temperature high?"'
-					'"Yes, quite so, 39.2°C." you tell her, followed by a sneeze.'
+					'"Yes, quite so. 39.2°C," you tell her, followed by a sneeze.'
 					'"Very well. A doctor will come see you at home."'
 					'"How soon?"'
-					'"As soon as one is free." she answers. "Yours isn''t an isolated case."'
-					'"Thank you." you respond and hang up.'
+					'"As soon as one is free," she answers. "Yours isn''t an isolated case."'
+					'"Thank you," you respond and hang up.'
 					if ninelsex = 1:
 						act 'Is Ninel available?':
 							cla
 							'"Is Doctor Pavlovna available? She is my regular doctor."'
 							'"Let me check." The nurse puts you on hold for a few minutes before returning. "Yes, she is free and will make the house call."'
-							'"Once again, thank you very much." you reply and hang up.'
+							'"Once again, thank you very much," you reply and hang up.'
 							act 'Continue':gt'housecall','ninel3'
 						end
 					end
 					act 'Go back to bed':
-						cla
-						*clr
-						picrand = RAND(0,6)
+						*clr & cla
+						picrand = rand(0,6)
 						if picrand = 0:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick27.jpg"></center>'
 						if picrand = 1:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick21.jpg"></center>'
 						if picrand = 2:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick22.jpg"></center>'
@@ -313,7 +297,7 @@ $polidin = {
 						if picrand = 4:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick24.jpg"></center>'
 						if picrand = 5:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick25.jpg"></center>'
 						if picrand = 6:'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/sick26.jpg"></center>'
-						timerand = RAND(0,5)
+						timerand = rand(0,5)
 						if timerand = 0:minut = minut + 30
 						if timerand = 1:minut = minut + 60
 						if timerand = 2:minut = minut + 90
@@ -323,11 +307,11 @@ $polidin = {
 						'You lie in bed, shivering while wrapped in a blanket. Time drags by painfully slow. You can''t say how much time passes before the doorbell rings.'
 						act 'Open the door':
 							if ninelmet > 0 and sick <= 50:
-								gt'housecall','ninel1'
+								gt 'housecall','ninel1'
 							elseif ninelmet = 0 or sick > 50:
-								doctrnd = RAND(0,1)
+								doctrnd = rand(0,1)
 								if doctrnd = 0:dynamic $drPP
-								if doctrnd = 1:gt'housecall','ninel0'
+								if doctrnd = 1: gt 'housecall','ninel0'
 							end
 						end
 					end

locations/korrPar.qsrc

@@ -1,6 +1,7 @@
 # korrPar
 
 music_loop = 0
+CLOSE ALL
 menu_off = 0
 
 if sound = 0 and pavhome_enter = 1:

locations/kuhr.qsrc

@@ -27,8 +27,8 @@ if remkuhr = 1:'<center><img <<$set_imgh>> src="images/locations/city/residentia
 if kransloman = 1:
 	cla
 	'You notice a leak in your sink. It''s broken and you''ll need to call a plumber.'
-	if Grisha = 0:act 'Call the plumber':dynamic $santehnik
-	if Grisha > 0:act 'Call Grisha':dynamic $santehnikgr
+	if Grisha = 0: act 'Call the plumber': dynamic $santehnik
+	if Grisha > 0: act 'Call Grisha': dynamic $santehnikgr
 
 	act 'Leave': killvar 'fullmorrout' & gt 'korr' 
 
@@ -67,13 +67,12 @@ end
 if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
 
 if husband > 0 and husbandrink ! 10:
-	if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
+	if hour = 7 or hour = 17: 'Your <a href="exec:gt ''husb'', ''start''">husband /a> is eating at the table.'
 end
 
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook a meal for your husband and yourself (1:00)':
-		cla
-		*clr
+		*clr & cla
 		husband += 5
 		eda -= 2
 		minut += 60
@@ -109,8 +108,7 @@ end
 
 if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate with dildo':
-		cla
-		*clr
+		*clr & cla
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 		pcs_mood += 15
 		pcs_vag += 1
@@ -120,29 +118,27 @@ if dildo > 0 and pcs_horny >= 50:
 				gt 'husbsex','husb_mastr_vtor'
 			else
 				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-				'Unable to control yourself, you immediately reach for your dildo so you can take care of your lustful desires. You waste no time in attaching the suction base of the dildo to the floor before lowering yourself slowly onto it.'
-				'Shivers run down your spine as you feel the thick head spreading your lips and soon the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when the dildo bottoms out inside you.'
-				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. Your ass is hammering against the floor with each thrust and it takes you just a few minutes to reach orgasm, your toes curling tightly as your entire body is overwhelmed in pleasure.'
-				'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
-				
+				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+				'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+				'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
 				
-				act 'Breathe':gt 'kuhr'
+				act 'Breathe': gt 'kuhr'
 			end
 		else
 			'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-			'Unable to control yourself, you immediately reach for your dildo so you can take care of your lustful desires. You waste no time in attaching the suction base of the dildo to the floor before lowering yourself slowly onto it.'
-			'Shivers run down your spine as you feel the thick head spreading your lips and soon the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when the dildo bottoms out inside you.'
-			'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. Your ass is hammering against the floor with each thrust and it takes you just a few minutes to reach orgasm, your toes curling tightly as your entire body is overwhelmed in pleasure.'
-			'Your juices drip down the length of the dildo, pooling on the floor beneath you. You take a few deep breaths and a satisfied smile grows on your face. That was just what you needed!'
-				
+			'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+			'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+			'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+			'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 			gs 'arousal', 'end'
-				
-			act 'Breathe':gt 'kuhr'
+		
+			act 'Breathe': gt 'kuhr'
 		end
 	end
 end

locations/lover.qsrc

@@ -140,9 +140,12 @@ if $ARGS[0] = 'add fuckbuddy':
 	else
 		gs 'boyStat',$ARGS[1]
 	end
-	$fuckbuddy[] = $boy
-	$npc_rel_type[$boy] = 'fuckbuddy'
-	gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+	! Do not add when he has already been added.
+	if arrpos('$fuckbuddy',$boy) = -1:
+		$fuckbuddy[] = $boy
+		$npc_rel_type[$boy] = 'fuckbuddy'
+		gs 'telefon', 'AddContact', $boy, $npc_pic[$boy],'',"hour >= 8 and hour <= 22",'', "hour >= 8 and hour <= 22", 0
+	end
 end
 
 if $ARGS[0] = 'remove fuckbuddy':

locations/lusso.qsrc

@@ -35,14 +35,29 @@ if $ARGS[0] = 'panties':
 	*clr & cla
 	gs'stat'
 
-	act 'Return': minut += 1 & gt 'lusso', 'start'
+	gs 'panties', 'shop_filter_header'
 
-	i = 1
+	act 'Return': minut += 1 & gt 'lusso', 'start'
 
-	:looplusso_panties
-		if lusso_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''panties2''"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 82:jump 'looplusso_panties'
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
+
+		i = 1
+
+		:looplusso_panties
+			if lusso_panties[i] = 0:
+				gs 'underwear_attributes', 'lusso_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''lusso'', ''panties2''"><img src="images/pc/items/lusso/panties/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 82:jump 'looplusso_panties'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'panties2':
@@ -66,14 +81,29 @@ if $ARGS[0] = 'bras':
 	*clr & cla
 	gs'stat'
 
-	act 'Return': minut += 1 & gt 'lusso', 'start'
+	gs 'bras', 'shop_filter_header'
 
-	i = 1
+	act 'Return': minut += 1 & gt 'lusso', 'start'
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
+
+		i = 1
+
+		:looplusso_bras
+			if lusso_bras[i] = 0:
+				gs 'underwear_attributes', 'lusso_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bras2''"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 33:jump 'looplusso_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 
-	:looplusso_bras
-		if lusso_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bras2''"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 33:jump 'looplusso_bras'
 end
 
 if $ARGS[0] = 'bras2':
@@ -97,14 +127,29 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
+	gs 'underwear_bodysuits', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'lusso', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbodysuitquality_filter
 
-	:looplusso_bodysuit
-		if lusso_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		i = 1
+
+		:looplusso_bodysuit
+			if lusso_bodysuits[i] = 0:
+				gs 'underwear_attributes', 'lusso_bodysuits', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+				end
+			end
 		i += 1
-	if i <= 90:jump 'looplusso_bodysuit'
+		if i <= 90:jump 'looplusso_bodysuit'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbodysuitquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bodysuit2':

locations/medical_din.qsrc

@@ -10,16 +10,16 @@ if $ARGS[0] = 'birth_control':
 					menu_off = 1
 					minut += 15
 					'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-					'You are escorted into an examination room, where you are told that say have to do a small test before giving you the shot. You wait for fifteen minutes before the nurse comes back in.'
+					'You''re escorted into an examination room, where you''re told that they must do a small test before giving you the shot. You wait for fifteen minutes before the nurse comes back in.'
 					if preg = 0:
 						money -= 2750
 						gs 'medical_din','birthControlShot'
-						'"Everything looks great." She says and gives you a reassuring smile as she sticks a needle in your arm, and depresses the plunger. Seconds later she explains: "All done! You should be good to go for three months, give or take. It depends a bit from person to person: Body type, hormone levels, and so on. If you want to be perfectly safe, we recommend you come back for another treatment one week before the three months are over. Have a nice day, miss!"'
-						'You thank her and wish her the same, while you gather your things. You silently mutter to yourself: "If it is that simple, why did they make me wait 15 minutes..."'
+						'"Everything looks great," she says and gives you a reassuring smile as she sticks a needle in your arm and depresses the plunger. "All done! You should be good for three months, give or take. It depends on body type, hormone levels and so on. If you want to be perfectly safe, we recommend you come back for another treatment one week before the three months are over. Have a nice day, Miss <$pcs_lastname>>!"'
+						'You thank her and wish her the same while you gather your things.'
 					else
 						money -= 650
-						'"I''m sorry, but we can''t give you the shot, because you''re pregnant."'
-						'After the initial shock subsides you pay the 650 <b>₽</b> for the test and leave.'
+						'"I''m sorry, but we can''t give you the shot because you''re pregnant."'
+						'After the initial shock subsides, you pay the 650 <b>₽</b> for the test and leave.'
 						thinkpreg = 1
 						knowpreg = 1
 					end
@@ -27,7 +27,7 @@ if $ARGS[0] = 'birth_control':
 					act 'Leave': gt $loc, $loc_arg
 				end
 			else
-				act 'Get a birth control shot for <font color="red">3,900 <b>₽</b></font> (0:15)': '<br><font color="red">You don''t have enough money to get a birth control shot.</font>'
+				act 'Get a birth control shot for 2,750 <b>₽</b> (0:15)': '<br><font color="red">You don''t have enough money to get a birth control shot.</font>'
 			end
 		end
 		if birth_control['implant_status'] = 0:
@@ -37,7 +37,7 @@ if $ARGS[0] = 'birth_control':
 					menu_off = 1
 					minut += 15
 					'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-					'You are escorted into an examination room, where you are told that say have to do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
+					'You''re escorted into an examination room, where you''re told that they must do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
 					if preg = 0:
 						minut += 20
 						money -= 19650
@@ -45,13 +45,13 @@ if $ARGS[0] = 'birth_control':
 						birth_control['implant_timer'] = 1095
 						pillcon += ((pillcon + 15000) / 25) + 4000
 						pillcon2 += ((pillcon2 + 15000) / 25) + 4000
-						'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
-						'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision and pushes a small tube inside your arm. It isn''t bigger than a matchstick.'
+						'"Everything looks great," she says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+						'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect before she makes a tiny incision and pushes a small tube inside your arm. It''s no bigger than a matchstick.'
 						'"All done! You should be good to go for three years."'
 					else
 						money -= 650
-						'"I''m sorry, but we can''t give you the implant, because you''re pregnant."'
-						'After the initial shock subsides you pay the 650 <b>₽</b> for the test and leave.'
+						'"I''m sorry, but we can''t give you the implant because you''re pregnant."'
+						'After the initial shock subsides, you pay the 650 <b>₽</b> for the test and leave.'
 						thinkpreg = 1
 						knowpreg = 1
 					end
@@ -59,7 +59,7 @@ if $ARGS[0] = 'birth_control':
 					act 'Leave': gt $loc, $loc_arg
 				end
 			else
-				act 'Get a birth control implant for <font color="red">19,650 <b>₽</b></font> (0:35)': '<br><font color="red">You don''t have enough money to get a birth control implant.</font>'
+				act 'Get a birth control implant for 19,650 <b>₽</b>(0:35)': '<br><font color="red">You don''t have enough money to get a birth control implant.</font>'
 			end
 		elseif birth_control['implant_status'] = 1 or birth_control['implant_status'] = 2:
 			if money >= 19650:
@@ -68,7 +68,7 @@ if $ARGS[0] = 'birth_control':
 					menu_off = 1
 					minut += 15
 					'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-					'You are escorted into an examination room, where you are told that say have to do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
+					'You''re escorted into an examination room, where you''re told that say have to do a small test before inserting the implant into your left arm. You wait for fifteen minutes before the nurse comes back in.'
 					if preg = 0:
 						minut += 20
 						money -= 19650
@@ -76,15 +76,15 @@ if $ARGS[0] = 'birth_control':
 						birth_control['implant_timer'] = 1095
 						pillcon += ((pillcon + 15000) / 25) + 4000
 						pillcon2 += ((pillcon2 + 15000) / 25) + 4000
-						'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
-						'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision, takes out your old implant and pushes in a new one.'
-						'"All done! You should be good to go for three years."'
+						'"Everything looks great," she says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+						'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect before she makes a tiny incision, takes out your old implant and pushes in a new one.'
+						'"All done! You should be good to go for another three years."'
 					else
 						birth_control['implant_status'] = 0
 						birth_control['implant_timer'] = 0
 						money -= 1650
-						'"I''m sorry, but we can''t give you the implant again, because you''re pregnant."'
-						'After the initial shock subsides you pay the 1650 <b>₽</b> for the test and the removal of your old implant leave.'
+						'"I''m sorry, but we can''t renew your implant because you''re pregnant."'
+						'After the initial shock subsides, you pay the 1650 <b>₽</b> for the test and the removal of your old implant leave.'
 						thinkpreg = 1
 						knowpreg = 1
 					end
@@ -105,12 +105,11 @@ if $ARGS[0] = 'birth_control':
 				money -= 1000
 				birth_control['implant_status'] = 0
 				birth_control['implant_timer'] = 0
+				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
-				'"Everything looks great." She says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
-				'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect, before she makes a tiny incision and takes out your old implant. "All done!"'
-					
+				'"Everything looks great," she says and gives you a reassuring smile. "Please lie down, the procedure won''t take long."'
+				'She numbs part of your upper arm with a local anesthetic. You have to wait for a few minutes for it to take a effect before she makes a tiny incision and removes your implant. "All done!"'
 				
-				gs 'stat'
 				act 'Leave': gt $loc, $loc_arg		
 			end
 		else
@@ -268,14 +267,14 @@ if $ARGS[0] = 'morning_after_pill':
 	if $locclass = 'kitr':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/pill_take2.jpg"></center>'
 		if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-			'<i>I suppose this is why Aunt Luda gave me this,</i> you think guiltily as you take out the morning after pill.'
+			'<i>I suppose this is why Aunt Luda gave me this,</i> you think as you take out the morning after pill.'
 			*nl
 		end
-		'You fill up a small glass of water and pop the pill out of the packaging. Putting it in your mouth, you gulp, washing it down with sips from the glass after.'
+		'You fill up a small glass of water and pop the pill out of the packaging. Putting it in your mouth, you gulp and wash it down with sips of water from the glass.'
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/birthcontrol/pill_take1.jpg"></center>'
 		if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
-			'<i>I suppose this is why Aunt Luda gave me this,</i> you think guiltily as you take out the morning after pill.'
+			'<i>I suppose this is why Aunt Luda gave me this,</i> you think as you take out the morning after pill.'
 			*nl
 		end
 		'Removing the pill from the packaging, you pop it in your mouth and gulp it down dry, wincing in discomfort as you feel it stick slightly on the way down.'

locations/metro.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'metro'
 	$menu_arg = 'start'
 	menu_off = 0
-	if sound = 0:PLAY 'sound/metro' + rand(1,4) + '.mp3',30
+	if sound = 0: PLAY 'sound/metro' + rand(1,4) + '.mp3', 30
 	'<center><b><font color="maroon">Metro station</font></b></center>'
 	if $loc = 'city_residential':
 		'<center><b><font color="maroon">Residential Area</font></b></center>'
@@ -116,14 +116,14 @@ if $ARGS[0] = 'vagon':
 	menu_off = 1
 
 	'<center><b><font color="maroon">Metro car</font></b></center>'
-	if hour < 7 or hour >=22:
-		if rand(0, 100) >= 70:gt 'metro_events', 'frot'
+	if hour < 7 or hour >= 22:
+		if rand(0, 100) >= 70: gt 'metro_events', 'frot'
 		metro_busy = rand(0,1)
 	elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
-		if rand(0, 100) >= 80:gt 'metro_events', 'frot'
+		if rand(0, 100) >= 80: gt 'metro_events', 'frot'
 		metro_busy = rand(1,2)
 	else
-		if rand(0, 100) >= 90:gt 'metro_events', 'frot'
+		if rand(0, 100) >= 90: gt 'metro_events', 'frot'
 		metro_busy = rand(2,3)
 	end
 
@@ -149,12 +149,12 @@ if $ARGS[0] = 'vagon':
 	end
 
 	act 'Get out of the car':
-		if hour < 7 or hour >=22:
-			if rand(0, 100) >= 70:gt 'metro_events', 'station'
+		if hour < 7 or hour >= 22:
+			if rand(0, 100) >= 70: gt 'metro_events', 'station'
 		elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
-			if rand(1,100) >= 80:gt 'metro_events', 'station'
+			if rand(1,100) >= 80: gt 'metro_events', 'station'
 		else
-			if rand(1,100) >= 90:gt 'metro_events', 'station'
+			if rand(1,100) >= 90: gt 'metro_events', 'station'
 		end			
 		gt 'metro', 'start'
 	end
@@ -197,7 +197,7 @@ if $ARGS[0] = 'shop':
 	end
 	if money >= 250:
 		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-		if money >= 500:'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
+		if money >= 500: 'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
 	else
 		'Buy enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end
@@ -206,8 +206,10 @@ end
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
-	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up." He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath. He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'
-	act 'Continue':gt 'metro','shop'
+	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."' 
+	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.' 
+	'He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'
+	act 'Continue': gt 'metro','shop'
 end
 
 --- metro ---------------------------------

locations/mey_vika_events.qsrc

@@ -27,9 +27,6 @@ if $ARGS[0] = 'first_visit':
 	$location_type = 'event'
 	! for the first time - familiarity with TM
 	if mey_vika['mey_vika_qw'] = 20: gt 'mey_tamara_events', 'first_meet'
-	minut += 10
-	pcs_horny += 10
-	gs 'stat'
 	'<center><h4><font color="maroon">Vicky''s room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_qw_30.jpg"></center>'
 	'As soon as you walk in the room, Vicky throws herself onto Vanya. Wraps her legs around his waist and hugs him around the neck. They start making out. Vanya holds Vicky''s ass and starts squeezing it. While you watch them, you start feeling aroused. They finally stop...'
@@ -38,12 +35,12 @@ if $ARGS[0] = 'first_visit':
 	'"Why are you standing!" Asks Vicky. "Make yourself comfortable! Relax!" She drags Vanya and you down onto the enormous bed.'
 	'The three of you mess around for a bit, laughing, squealing and growling. Vicky and Vanya put on a show where Vanya plays a bear growling and chasing Vicky around the bed. The neatly laid bed turns into a complete mess after a few seconds. All of a sudden the growling stops and you see Vicky pulling up her T-shirt, revealing hers small perky breasts. She''s not wearing a bra and she''s slowly pulling the shirt off, teasing both you and Vanya.'
 	'Vanya, seeing an opportunity decides to help out. But Vicky seems to deliberately prevent him and instead he starts touching her breasts. As you watch on your arousal intensifies.'
+	gs 'arousal', 'foreplay', 10, 'group'
+	gs 'stat'
 
 	act 'Further':
 		*clr & cla
-		pcs_horny += 10
 		alko = 2
-		gs 'stat'
 		'<center><h4><font color="maroon">Vicky''s room</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_qw_35.jpg"></center>'
 		'Finally removing the t-shirt, she says...'
@@ -57,6 +54,8 @@ if $ARGS[0] = 'first_visit':
 		'You start feeling a bit buzzed, getting that good and fun feeling.'
 		'"<<$pcs_nickname>>, come and join us here on the bed, we''re about to start." Vicky calls you over.'
 		'You jump onto the bed and wait for Vanya to shuffle the cards.'
+		gs 'arousal', 'foreplay', 10, 'group'
+		gs 'stat'
 
 		act 'Start playing': gt 'mey_vika_events', 'play_game'
 	end
@@ -152,9 +151,9 @@ if $ARGS[0] = 'play_game_wish0':
 	'An overexcited Vicky jumps up and screams: "That''s not all!" She rips off his briefs, revealing his fairly sized cock, dangling in front of her face.'
 	'Vanya doesn''t mind, because Vicky''s already on her knees licking the top of his cock, while he''s stroking it.'
 	'You turn away in shame, covering your eyes. But you''re overcome with hornyness when you feel someone sliding their hand between your legs, touching your wet panties.'
-
-	pcs_horny += iif(pcs_horny < 60,40,20)
+	gs 'arousal', 'foreplay', 10, 'group'
 	gs 'stat'
+	
 	if stat['think_virgin'] = 0:
 		act 'Further':
 			*clr & cla
@@ -171,6 +170,7 @@ if $ARGS[0] = 'play_game_wish0':
 				'Opening your eyes, you are astonished to see that it''s Vicky who''s been teasing you! She smiles at you while removing your panties. She eagerly begins licking you, sending shivers all over your body. You start panting, edging, ready to cum. Vicky noticing you nearing the edge intensifies her tongue movements. All of a sudden you feel her tongue moving more erratically, somewhat disturbing the pleasant feeling. You look up and see Vanya, moving in from behind, pushing his cock into Vicky. Vicky can''t keep on licking you and instead she starts moaning loudly, clearly enjoying Vanya''s cock. Not wanting to lose your orgasm you grab her by the head and drag her face towards your pulsating pussy. She comes to her senses again and starts licking you. Vicky''s tongue is so skillful you cum like a fountain all over her face.'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'cuni', 5, 'lesbian'
+				gs 'arousal', 'end'
 				gs 'stat'
 
 				act 'Further':
@@ -218,7 +218,6 @@ if $ARGS[0] = 'play_game_wish1':
 	menu_off = 1
 	$location_type = 'event'
 	if mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart: mey_vika['mey_vika_qw'] += 1
-	pcs_horny += 10
 	minut += 1
 	zz_stage = args[1]
 	gs 'stat'
@@ -232,6 +231,7 @@ if $ARGS[0] = 'play_game_wish1':
 		'Vicky grins slyly...'
 		'"Will you also join me?"'
 		'She moves over to the stereo and puts on some music. She begins dancing in the middle of the room.'
+		
 
 		act 'Continue': gt 'mey_vika_events', 'play_game_wish1', 16
 	elseif zz_stage <= 33:
@@ -243,49 +243,90 @@ if $ARGS[0] = 'play_game_wish1':
 		if zz_stage = 16:
 			'She starts off quite innocent, swaying to the music carefully. However, the innocence doesn''t last for very long...'
 			'She playfully touches herself, twirling to the music, arching her tight round booty.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 17:
 			'Moving sensually, she takes off her t-shirt, throwing it in your face.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 18:
 			'Turning her back to you, Vicky, playfully looking at you, takes off the skirt.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 19:
 			'She lower her panties a bit, exposing just a little of her ass. Her ass is wonderfully shaped, making you a bit excited. After giving you a quick look she pulls them back.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 20:
 			'She turns again looking in your direction. Touching herself, she slowly starts removing the bra.'
 			'Playfully spinning, she slips her bra off. Covers her breasts with a hand and after waving her bra around, throws it in your lap.'
 			'Vicky''s little show is making you more turned on, and when the bra falls in your lap, you feel your panties getting wet.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 21:
 			'She once again grabs her panties and pulls them down, this time exposing her wonderful pussy. After giving you a quick glance she pulls them back!'
 			'After teasing you for a while she grabs her panties, pulling them down, this time dropping them almost to the floor.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 22:
 			'With that, she turns to you. Vanya sits behind her enjoying the show. Wanting to give Vanya a show, she bends over, pulling off her panties, revealing a dripping wet pussy.'
+			gs 'arousal', 'voyeur', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 23:
 			'Turning to you, Vicky teases you with her breasts, lifting them from below.'
 			'You are no longer able to hold back, you let out a little moan and slide a hand between your legs. You don''t care that Vanya is sitting there.'
 			'In the corner of your eye you notice that he has taken his pants off and started masturbating.'
+			gs 'arousal', 'voyeur', 2, 'group', 'masturbate'
+			gs 'stat'
 		elseif zz_stage = 24:
 			'Vicky drops on her knees and starts crawling towards you, purring like a big red cat in heat.'
+			gs 'arousal', 'voyeur', 2, 'group', 'masturbate'
+			gs 'stat'
 		elseif zz_stage = 25:
 			'She starts touching you under your clothes, kissing you. You return the favor and passionately kiss her back, gently touching her breasts.'
+			gs 'arousal', 'kiss', 2, 'group', 'masturbate'
+			gs 'stat'
 		elseif zz_stage = 26:
 			'However, this is not the end of the dance.'
 			'Vicky, showing great flexibility, does a few acrobatic moves, widely spreading her legs and revealing her pussy to you and Vanya. You see her pussy shining from all the juices.'
+			gs 'arousal', 'voyeur', 2, 'group', 'masturbate'
+			gs 'stat'
 		elseif zz_stage = 27:
 			'Vicky takes you by the hand and pulls you up to Vanya. You were so focused on Vicky that you forgot about Vanya being completely naked.'
 			'The two of you lie down on the huge bed, making out, while Vanya comes over, holding his cock in his hand.'
+			gs 'arousal', 'foreplay', 2, 'group', 'lesbian'
+			gs 'stat'
 		elseif zz_stage = 28:
 			'Vicky starts sucking his cock, bobbing her head up and down. While she''s doing that she makes sure not to forget about you, rubbing her fingers on your pussy lips, stimulating you.'
+			gs 'arousal', 'clit_finger', 2, 'group', 'lesbian'
+			gs 'stat'
 		elseif zz_stage = 29:
 			'Vicky keeps on sucking Vanya''s cock, she''s really skillful, fitting his whole cock in her mouth. You and Vanya start making out, your tongues touching and exchanging saliva. Seeing this, Vicky speeds up, clearly turned on by seeing her boyfriend kissing another girl.'
+			gs 'arousal', 'clit_finger', 2, 'group', 'lesbian'
+			gs 'arousal', 'kiss', -2, 'group'
+			gs 'stat'
 		elseif zz_stage = 30:
 			'You can''t really figure out who''s having most fun, you, Vanya or Vicky.'
 		elseif zz_stage = 31:
 			'Vicky, figuring that Vanya might cum soon, stops sucking him, leaving him with a throbbing cock to cool off for a minute. She pushes you on the bed and starts eating you out right away, making you edge immediately. Vanya, having rested for a bit begins fucking her from behind. The pleasure that Vanya gives her is making her lick your pussy even more passionately.'
+			gs 'arousal', 'cuni', 2, 'group', 'lesbian'
+			gs 'stat'
 		elseif zz_stage = 32:
 			'Without thinking, you begin licking her clit, double pleasuring her. She starts moaning loudly. She''s about to cum... Right in front of your nose you see Vanya''s cock going in and out of Vicky''s dripping pussy. When able, you sometimes lick Vanya''s cock wanting to taste Vicky even more...'
+			gs 'arousal', 'cuni', 2, 'group', 'lesbian'
+			gs 'arousal', 'cuni_give', -2, 'group', 'lesbian'
+			gs 'arousal', 'bj', 2, 'group'
+			gs 'stat'
 		elseif zz_stage = 33:
 			'After a couple of minutes Vicky starts shaking and groaning, cumming over your face and Vanya''s cock. She collapses on you, still shaking, Vanya pulls out of her pussy and cums all over her ass.'
 			'The hot jets of sperm hitting Vicky''s ass drip all over you, making you try to catch it all with your mouth.'
 			'Vicky, feeling rejuvenated, begins violently assaulting your vagina with her tongue and fingers, you only manage to hold on for a minute, screaming, squirting all over Vicky''s lovely face.'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 2, 'group', 'lesbian'
+			gs 'arousal', 'cuni_give', -2, 'group', 'lesbian'
+			gs 'cum_call', 'face', 'Vanya', 1
+			gs 'arousal', 'end'
+			gs 'stat'
 		end
 
 		act 'Continue': gt 'mey_vika_events', 'play_game_wish1', zz_stage+1
@@ -341,9 +382,9 @@ if $ARGS[0] = 'play_game_wish3':
 	'"Well, I lost, and will have to fulfill my promise." You lean to Vanya kissing him on the lips. Kissing someone else''s boyfriend fills you with excitement. Your private parts start pulsating, the juices start flowing and you feel your panties getting wet. His tongue intertwines in your mouth, you suck each other lips. Vanya holds you close to him and can you feel his erect cock pressing against you. You begin grabbing his ass, and at the end of your make out session you bite his lip.'
 	'Vicky heartily applauds.'
 	'"Wow! Well, you surprised me, <<$pcs_nickname>>! I never thought you were so cool! While I was watching the two of you I wanted to make out with you too, you little tease."'
-
-	pcs_horny += iif(pcs_horny < 60,40,20)
+	gs 'arousal', 'foreplay', 10
 	gs 'stat'
+	
 	act 'Next game': gt 'mey_vika_events', 'play_game'
 	act 'Finish': gt 'mey_vika_events', 'end_game'
 end
@@ -510,10 +551,10 @@ if $ARGS[0] = 'park_meet':
 			gs 'stat'
 			'As you''re leaving, you notice Vicky whispering something to Vanya. You notice Vanya''s hand stroking and squeezing Vicky''s butt, as they stare at you with lust in their eyes...'
 
-			if npc_rel['A15'] < 60:
+			if npc_rel['A15'] < 80:
 				act 'Finish your walk': gt 'pav_park', 'start'
 				exit
-			elseif npc_rel['A15'] >= 60 and mey_vika['mey_vika_qw'] >= 18:
+			elseif npc_rel['A15'] >= 80 and mey_vika['mey_vika_qw'] >= 18:
 				cla
 				if (month >= 5 and month <= 10) and (hour <= 20 and hour >= 8):
 					'Walking through the park, you meet Vicky and Vanya. They are going to the beach and ask you to join them.'
@@ -533,7 +574,30 @@ if $ARGS[0] = 'park_meet':
 						act 'Decline':
 							cla
 							*nl
-							'You currently have your period, and feel up to visiting the beach today, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
+							'You currently have your period, and don''t feel up to visiting the beach today, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
+
+							act 'Leave': gt 'pav_park', 'start'
+						end
+					end
+				elseif (month >= 11 or month <= 4) and (hour <= 20 and hour >= 8):
+					'Walking through the park, you meet Vicky and Vanya. They are going to the sauna and ask you to join them.'
+
+					if mesec = 0:
+						act 'Go with them to the sauna':
+							gt 'mey_vika_events', 'sauna_event'
+						end
+						act 'Decline':
+							cla
+							*nl
+							'You''re in in a hurry, so you decide to thank Vicky for the invite but that you have something elsewhere that you need to attend.'
+
+							act 'Leave': gt 'pav_park', 'start'
+						end
+					else
+						act 'Decline':
+							cla
+							*nl
+							'You currently have your period, and don''t feel up to visiting the sauna today, so you decide to thank Vicky for the invite but that you have a thing elsewhere that you need to attend...'
 
 							act 'Leave': gt 'pav_park', 'start'
 						end
@@ -638,33 +702,36 @@ if $ARGS[0] = 'cafe_qw':
 
 	act 'Hmm...':
 		*clr & cla
-		minut += 10
-		pcs_horny += 10
 		pcs_energy += 20
 		pcs_hydra += 10
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw1.jpg"></center>'
 		'You "accidently" drop a fork and bend down to pick it up. As you look under the table, you see Vicky with her legs spread wide while Vanya fingers her pussy and fondles her inner thighs, teasing the swollen clit, rubbing her lips, occasionally pushing his finger into her. As the fingers enter Vicky, she starts moving around trying to make herself cum.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'voyeur_sex', 10
+		gs 'stat'
 
 		act 'Further':
 			*clr & cla
 			minut += 2
-			pcs_horny = 100
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw2.jpg"></center>'
 			'So that''s why she was arching! You''re so mesmerized, you don''t even notice the pussy juice flowing down your own legs. You knees tremble, but the excitement is still growing. You start to panic a bit and just a few more minutes later you know you must get away or else they''ll see you orgasm.'
+			gs 'arousal', 'voyeur_sex', -100
+			gs 'stat'
+			
 
 			act 'Say goodbye':
 				*clr & cla
-				minut += 2
 				gs 'npc_relationship', 'modify', 'A15', 'like'
 				gs 'npc_relationship', 'modify', 'A165', 'like'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_org.jpg"></center>'
+				'You hastily say goodbye, wanting to get away. Vicky tries to say goodbye but she only manages to let out some quiet moans while Vanya begins speeding up. Seeing this you leave as quickly as you can. You turn around seeing them still at it, and right at the exit of the café a powerful orgasm hits you, making your legs tremble, barely keeping on your feet. You have to grab the railing of the porch of the café, just so you won''t fall over.'
+				$orgasm_or = 'yes'
+				gs 'arousal', 'voyeur_sex', 2, 'unknown'
+				gs 'arousal', 'end'
 				gs 'stat'
-				'You hastily say goodbye, wanting to get away. Vicky tries to say goodbye but she only manages to let out some quiet moans while Vanya begins speeding up. Seeing this you leave as quickly as you can. You turn around seeing them still at it, and right at the exit of the café a powerful orgasm hits you, making your legs tremble, barely keeping on your feet. You have to grab the railing of the porch of the café. Just so you won''t fall over.'
-
+				
 				act 'Go outside':
 					minut += 2
-					pcs_horny = 0
 					pcs_mood += 10
 					mey_vika['mey_vika_qw'] = 18
 					gs 'stat'
@@ -680,13 +747,13 @@ if $ARGS[0] = 'cafe_repeat_qw':
 	menu_off = 1
 	$location_type = 'event'
 	money -= 300
-	pcs_horny += 10
 	gs 'npc_relationship', 'modify', 'A15', 'like'
 	gs 'npc_relationship', 'modify', 'A165', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/sex/cafe_qw0.jpg"></center>'
 	'You sit in the café, eating pizza and chat with Vicky. You notice Vicky is acting somewhat strange, giggling, pressing herself against Vanya. One of his hands is almost constantly under the table, and you can hear Vicky purr quietly, arching her back, and lustfully looking at you, occasionally licking her lips.'
 	'Vanya keeps on joking as if nothing is going on. You observe them, and start getting a bit excited without really knowing why. They are clearly playing some kind of game. You keep wondering why Vanya''s hand is constantly under the table, and why Vicky is acting so strange like she''s trying to hide something?'
+	gs 'arousal', 'voyeur_sex', 10
 
 	if mey_vika['mey_vika_qw'] > 15:
 		'Of course, you know why they act this way, but you try not to show it, despite getting very turned on.'
@@ -724,15 +791,14 @@ if $ARGS[0] = 'park_qw':
 		gs 'stat'
 		act 'End the walk':
 			*clr & cla
-			minut += 10
 			gs 'npc_relationship', 'modify', 'A15', 'like'
 			gs 'npc_relationship', 'modify', 'A165', 'like'
-			gs 'stat'
 			'"What a wonderful walk, Vanya! We need to do this again some time."<br> Vanya suddenly grabs you both with his arms and twirls around. The two of you start laughing and playfully try to escape from his grip. When saying goodbye Vicky leans towards you... and gives you a kiss on the lips. This kiss feels extraordinary and surprises you a bit… Vanya also kisses you and you, once again, start getting turned on just like at the café.'
-
+			gs 'arousal', 'kiss', 10, 'group'
+			gs 'stat'
+			
 			act 'Go home':
 				minut += 5
-				pcs_horny += 20
 				pcs_mood += 5
 				if mey_vika['mey_vika_qw'] < 19: mey_vika['mey_vika_qw'] += 1
 				gs 'stat'
@@ -742,6 +808,135 @@ if $ARGS[0] = 'park_qw':
 	end
 end
 
+if $ARGS[0] = 'sauna_event':
+	*clr & cla
+	menu_off = 1
+	$location_type = 'event'
+	gs 'npc_relationship', 'modify', 'A15', 'like'
+	gs 'npc_relationship', 'modify', 'A165', 'like'
+	mey_vika['qw_day'] = daystart
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
+	'Walking arm in arm, you make your way towards the sauna, chatting about your day and laughing.' 
+	'As you get close, Vanya breaks away. "You two go on ahead, I''m gonna go and jump in the lake."'
+	'You and Vicky roll your eyes at him almost simultaneously, and she points to the snow on the ground. "Shouldn''t you do that after the sauna?"'
+	'With a shrug, Vanya smiles back with a wink. "Walking with you two lovely ladies has gotten me plenty warm on the way here, I need to cool off." Then, he walks down the path towards the boat dock.'
+	
+	act 'Further':
+		*clr & cla
+		minut += 5
+		pcs_mood += 10
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_1.jpg"></center>'
+		'Entering the sauna by yourselves, you quickly get changed and head towards the rocks to splash some water over them. Steam fills the room as you sit down on the bench next to Vicky, who is watching you with a smile on her face. "Hey <<$pcs_nickname>>, there are better ways we could turn the heat up in here, make it even steamier since Vanya is gone," she says mischievously.'
+		'"What do you mean?" you ask, looking around for something you might have missed.'
+		'Both Vanya and myself have been seeing you around in the park and at school, and we have talked about asking if you would be interested in a threesome together at some point..." Vicky says as she reaches over and puts a soft hand over your thigh. "... and I like you, maybe even more than a friend."'
+		'By this time, her face is very close to yours and you can feel your cheeks getting really red, and not from the heat rocks. "I don''t know... I..."'
+		gs 'stat'
+		
+		act 'Kiss her':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_2.jpg"></center>'
+			'At a loss for words, you just decide to close your eyes, lean forward and kiss her. The cherry flavor of her chapstick is the first thing you notice, then the softness of her lips, like velvet. Vicky was in shock for the briefest of seconds and then pulls you in closer, her hands roaming over your body, cupping your breasts and running her thumb over the slight bump that exposes your nipple''s presence.'
+			'Feeling turned on, you kiss her harder and part her lips with your tongue. Your own hands reach up and return the fondling, one hand slipping behind her bikini top and pushing it to the side, while you feel your own top being similarly moved aside for Vicky''s hand.'
+			'With a gasp of air, Vicky pulls back from your kiss and bites her lip in pleasure, moaning at your touch, and reaches over and rolls an exposed nipple between her fingers while she slowly pushes you backwards.'
+			'Sliding down, she nibbles on your other nipple and gives it a parting sensuous lick, before sliding down even further.'
+			gs 'arousal', 'kiss', 3, 'lesbian'
+			gs 'stat'
+			
+			act 'Further':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_3.jpg"></center>'
+				'While removing more of each others'' clothing, you watch as Vicky places kisses down your chest, across your tummy, then spreads your legs with her hands while she pecks the area around your labia with her velvety lips. "I have been wanting to do this to you for a while. Mmm", she says sensually, before licking the crevasse from the bottom up while staring into your eyes.'
+				'You arch your back as you feel her tongue part your nether lips and you drop your top to the floor next to Vicky''s discarded clothing.'
+				'Reaching down, you run a hand through her hair, while your other hand plays with one of your breasts. You lose track of time during your bliss when she stands up over you and turns around.'
+				gs 'arousal', 'cuni', 3, 'lesbian'
+				gs 'stat'
+				
+				act '69':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_4.jpg"></center>'
+					'Placing one leg to either side of you, she eases herself down once again and licks you between the legs from the other direction, and places her own cunny over your head.'
+					'Taking the opportunity, you reach up with both hands and run them over her plump ass. You give each cheek a pleasurable squeeze, before pulling her down over your lips and slipping your own tongue between her folds. Feeling Vicky''s tongue in yours quicken its momentum, you dive deeper into her folds and lap at her clit and inner walls with more gusto. You were just starting to feel a rise in pleasure being taken over by your orgasmic activities, when the door of the sauna opens.'
+					gs 'arousal', 'cuni', 3, 'lesbian'
+					gs 'arousal', 'cuni_give', -3, 'lesbian'
+					gs 'stat'
+					
+					act 'Who is it?':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_5.jpg"></center>'
+						'Vanya enters with a huge grin and takes in the scene in front of him. "Oh... I see you two are busy. Maybe I should come back later?" he asks and feigns turning around to leave.'
+						'Vicky lifts her head from your pussy long enough to glare at him playfully, "Don''t you dare! Get your ass over here and give me your cock!"'
+						'Vanya turns back towards you and lets his towel fall, showing off his larger than average hard cock and swinging it left and right. "That''s no way to ask, Vicky! Say ''please''."'
+						gs 'arousal', 'cuni', 3, 'lesbian'
+						gs 'arousal', 'cuni_give', -3, 'lesbian'
+						gs 'stat'
+						
+						act 'Vicky rides your face':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_6.jpg"></center>'
+							'Vicky''s demeanor changes in an instant as she responds in her most innocent voice, "Please Mister, can I have your cock in my mouth?", she says with the look of pure hunger on her face while she sits up and presses her snatch harder against your face."'
+							'With no other choice, you increase the tempo of your tongue in her folds, while she grinds your face in pleasure.'
+							'Vanya saunters over and places his rod in front of Vicky, who swallows it to the base in one gulp with practiced ease. Her happy bobbing up and down his shaft as he guides her head with his hands, causes her to press down even more and grind your face.' 
+							'Her wetness drips down your chin as she finally lifts up off of you, with a resounding pop of Vanya''s cock sliding out of her lips. She urges you to sit up on the next bench and spread your legs as she changes position, once again.'
+							gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+							gs 'stat'
+							
+							act 'Get eaten out':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_7.jpg"></center>'
+								'Vicky gets down on all fours, and places her lips over your crotch again. She sucks on your clit while she slides a couple fingers inside, which only goes faster as Vanya comes up behind her and presses the head of his dick into her pussy and slides himself into her.'
+								'Fucking Vicky doggy style, Vanya grabs her hips and pulls Vicky back into him, ramming her hard. She responds by moaning into your sex, sending vibrations through your body and bringing you back into mindless bliss.'
+								'You slowly start to feel yourself climax, and something in your face must have given it away, because Vanya gives Vicky a hearty smack on her ass and pulls her away from you, and flips her over onto her back.'
+								gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+								gs 'stat'
+								
+								act 'Ride her face':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_8.jpg"></center>'
+									'Laying on her back, Vicky spreads her legs, while Vanya gets back into position and rams into her. Vicky screams out with each thrust, and not wanting to let every jogger in the park know what''s going on in the sauna, you decide to place yourself over her head and lower yourself down and ride her face as hard as she rode yours.'
+									'Grinding yourself over her face, you quickly feel yourself edging closer and closer to orgasm. Vicky''s moans and screams in your slit, as Vanya picks up speed, only heightens the sensation.'
+									gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+									gs 'stat'
+									
+									act 'Orgasm':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_9.jpg"></center>'
+										'By this time, all three of you are moaning loudly and Vicky is the first to climax. Her body shakes and spasms underneath you, and the force of her orgasmic scream in your folds is enough to make you release your juices all over the girl''s face. You reach out and grasp both of her breasts and squeeze them, just to keep yourself steady.'
+										'Vanya continues to plunge into Vicky for only a few more seconds, just enough to send her into a second convulsion, before sliding out of her and spraying her used slit and stomach with his seed with a deep moan and heavy breathing. He catches his breath and rolls over to lay back on a bench, "Oh, now that was fun."'
+										$orgasm_or = 'yes'
+										gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+										gs 'arousal', 'end'
+										gs 'stat'
+										
+										act 'Aftercare':
+											*clr & cla
+											minut += 20
+											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/wintalt_10.jpg"></center>'
+											'"Yes, it was... we should definitely do this again. What do you think, <<$pcs_nickname>>? Is this arrangement to your liking? Maybe even Vanya can have some fun with you too, but we can work that out later," Vicky says to you, while you slide up behind her and run your hands over her body once more.'
+											'"Yeah, I''d be up for this again. And I''ll think about Vanya''s involvement," you say, sticking your tongue out at him playfully before giving Vicky one last passionate kiss.'
+											'"I promise I won''t bite... unless you ask nicely," he responds with a playful wink in kind.'
+											'You spend the next few minutes getting cleaned up and dressed, before leaving the sauna.'
+											'Tired, but satisfied, the three of you walk back. Vicky is following you home, and just as you''re about to part ways, she sweetly kisses you on the lips.'
+											'"We should hang out at my place sometime. I''ll introduce you to my mother. I''m sure she''ll be delighted to get to know you."'
+											'You answer that you''ll definitely think about it and thank her for the invitation.'
+											'"Don''t forget about it now, <<$pcs_nickname>>!" Vicky presses on.'
+											'"Of course I won''t, Vicky!" you sincerely reply.'
+											gs 'arousal', 'kiss', 3, 'lesbian'
+											mey_vika['mey_vika_qw'] = 20
+											gs 'stat'
+											gs 'mey_vika_events', 'beach_ender'
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+	
 if $ARGS[0] = 'beach_event0':
 	*clr & cla
 	menu_off = 1
@@ -749,10 +944,11 @@ if $ARGS[0] = 'beach_event0':
 	gs 'npc_relationship', 'modify', 'A15', 'like'
 	gs 'npc_relationship', 'modify', 'A165', 'like'
 	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach1.jpg"></center>'
 	if args[1] < 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach1.jpg"></center>'
 		'You arrive at the beach seeing more people than usual and lots of children running around. Vicky frowns...'
-		'"Where the hell are we going to find a spot. You can neither breathe nor fart... I would like to sunbathe, and take a dip in the lake... Well, at least we brought some beers with us...'
+		'"Where the hell are we going to find a spot. You can neither breathe nor fart... I would like to sunbathe, and take a dip in the lake... Well, at least we brought some beers with us..."'
 
 		act 'Go to the remote beach': gt 'mey_vika_events', 'beach_event0', 1
 	else
@@ -798,14 +994,13 @@ if $ARGS[0] = 'beach_event0':
 
 				act 'Further':
 					*clr & cla
-					pcs_horny += iif(pcs_horny < 60, 50, 20)
-					minut += 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach5.jpg"></center>'
 					'"Vanya, don''t just stand there! You haven''t finished yet! My chest area is the most critical one it needs special attention." She lies back, relaxing, waiting for Vanya''s hands to start.'
 					'Vanya massages her body, rubbing lotion, putting special emphasis on her breasts, Vicky purrs and arches her back like a cat. Her nipples stiffen from the pleasure. Vanya moves downwards starting on her feet. He applies the lotion tenderly, massaging each toe, gradually moving upwards again. His hands start massaging her thighs, applying lotion, often touching her bikini bottom as if by accident. Vicky bends her knees and looks towards you...'
 					'"Do you enjoy the view?"'
 					'Her catching you red-handed is turning you on. You feel a bit wet. You also notice that Vanya has a boner, his cock is clearly sticking out.'
 					'"I need to go and cool off." He says, and goes for a swim.'
+					gs 'arousal', 'voyeur', 5, 'group'
 
 					! check celostnosti
 					if stat['think_virgin'] = 1:
@@ -820,9 +1015,6 @@ if $ARGS[0] = 'beach_event0':
 						! gg not a girl, continue
 						act 'Further':
 							*clr & cla
-							pcs_horny += 20
-							minut += 5
-							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach6.jpg"></center>'
 							'Vicky turns toward you...'
 							'"<<$pcs_nickname>>, you also need to use suntan lotion. The sun is scorching hot!"'
@@ -848,11 +1040,11 @@ if $ARGS[0] = 'beach_event0':
 							'"What if Vanya sees us?"'
 							'Vicky starts laughing...'
 							'"It''s not like he hasn''t seen it before."'
+							gs 'arousal', 'voyeur', 5, 'lesbian'
 
 							act 'Further':
 								*clr & cla
-								pcs_horny += 20
-								minut += 5
+								gs 'boystat', 'A165'
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/vika_beach7.jpg"></center>'
 								'You take off your bikini top too. Your nipples stiffen just from knowing that Vanya is also here. You''re not alone here.'
@@ -861,23 +1053,27 @@ if $ARGS[0] = 'beach_event0':
 								'You''re also getting turned on, your feel your bikini bottom getting wet.'
 								'"Lets switch. Lie on your back." Vicky grabs the bottle from you.'
 								'She sits on top of you and generously covers your body with lotion. Her pussy, which is literally stuck to the bottom of your stomach, is so wet that it seems you could just smear it all over your body, no lotion needed. Her hands stroke and massage your breasts, playing with your nipples. Both of you are panting heavily. Suddenly she reaches into your crotch, your wide-open pussy is ready, dripping your juice all over her fingers. She leans in for a long and juicy kiss. She start pulling off your bottom and to help her out you lift your butt and with one hand, help her to pull them off you. You kiss passionately, unable to break away from each other, petting, stroking and caressing each other, forgetting about Vanya who''s still swimming.'
+								gs 'arousal', 'massage', 5, 'lesbian'
+								gs 'arousal', 'kiss', -5, 'lesbian'
 
 								act 'Further':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_beach8.jpg"></center>'
 									'Suddenly Vicky begins moaning loudly, biting your lower lip while you kiss. She starts pinching your nipples. It''s very painful, as if she''s determined to tear them apart. You can hear her rhythmically panting. The pain almost brings you back from the heights of ecstasy down to earth. Opening your eyes, you realize that Vanya has snuck up from behind and is licking Vicky excitedly, making her act like a wild animal.'
+									gs 'arousal', 'kiss', 5, 'lesbian'
+									gs 'arousal', 'voyeur', -5, 'group'
 
 									act 'Further':
 										*clr & cla
-										pcs_horny += 20
-										minut += 30
-										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_beach9.jpg"></center>'
 										'You begin moaning louder again, edging, ready to cum... The pain you''re experiencing from the merciless pinching is making you even more turned on. Vicky is now sliding two of her fingers into you, trying to lube you up as much as possible for Vanya. Vanya''s presence seems to only edge her on as she speeds up bringing you almost to an orgasm.'
 										'Vicky squeals loudly...'
 										'"Vanya, not yet..."'
 										'Vanya comes from behind Vicky and starts teasing you with his cock, pressing against your pussy lips. Vicky grabs Vanya''s shaft, begins licking it and signals you to come over and join her. '
 										'You enthusiastically move over to Vanya licking his shaft, teasing him and finally having your lips envelop Vanya''s hard cock. While you''re pleasuring her boyfriend Vicky continues petting you edging you once more, stopping just before you orgasm as if she wants you to suffer.'
+										$orgasm_or = 'no'
+										gs 'arousal', 'vaginal_finger', 20, 'group', 'lube'
+										gs 'arousal', 'bj', -5, 'group'
 
 										act 'Further':
 											*clr & cla
@@ -886,14 +1082,18 @@ if $ARGS[0] = 'beach_event0':
 											'Exhausted, and still shivering, you lie between Vanya and Vicky. They hug you, kissing and caressing your body.'
 											'"That was wonderful, <<$pcs_nickname>>." whispers Vicky. "I hope you''re not mad at us? Vanya and I have for the longest time wanted to experience a threesome. We really got fond of you, but we did not dare to ask you. We didn''t know how you would react."'
 											'Your only response is you gently kissing them both.'
+											$orgasm_or = 'yes'
+											gs 'arousal', 'vaginal', 10, 'group'
+											gs 'arousal', 'kiss', -5, 'group'
+											gs 'arousal', 'end'
+											gs 'stat'
 
 											act 'Further':
 												*clr & cla
-												pcs_horny = 0
 												minut += 10
 												gs 'stat'
-!!Image needed												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_beach11.jpg"></center>'
-												'Tired but satisfied, the three of you walk back. Vicky is following you home, and just as you''re about to part ways she sweetly kisses you on the lips.'
+												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/sex/vika_beach11.jpg"></center>'
+												'Tired, but satisfied, the three of you walk back. Vicky is following you home, and just as you''re about to part ways she sweetly kisses you on the lips.'
 												'"We should hang out at my place sometime. I''ll introduce you to my mother. I''m sure she''ll be delighted to get to know you."'
 												'You answer that you''ll definitely think about it and thank her for the invitation.'
 												'"Don''t forget about it now, <<$pcs_nickname>>!" Vicky presses on.'
@@ -1383,12 +1583,11 @@ if $ARGS[0] = 'gym1':
 							act 'Further':
 								*clr & cla
 								minut += rand(10,20)
-								pcs_horny += 20
 								gs 'stat'
 								mey_vika['gym_day'] = daystart
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/vicky/event/gym26.jpg"></center>'
 								'Vicky is almost done and is now finishing by doing some relaxation exercises. As soon as she''s finished, she runs down, picks up her clothes, and quickly runs back to her room.'
-
+								gs 'arousal', 'voyeur', -20, 'lesbian'
 								act 'Well, that was interesting...': gt 'mey_home', 'start'
 							end
 						end

locations/miroslava.qsrc

@@ -114,21 +114,22 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		end
 
 		if hour >= 13 and hour < 16 and temper >= 15 and sunWeather = 1:
-			act 'Swim in the nearby river':
-				menu_off = 1
-				*clr & cla
-				minut += 15
-				cumspclnt = 4 & gs 'cum_cleanup'
-				pcs_sweat = 10 + rand(0,4)
-				pcs_mood += 5
-				if pcs_stren < 30:gs 'exp_gain', 'stren', 1
-				if pcs_inhib < 50:inhib_exp += rand(1,2)
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
-				'You wade in the river, splashing around with Mira is a lot of fun.'
-				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+			if pcs_stam >= (5 * (10 - sport_clothes_exercise_bonus)) / 2:
+				act 'Swim in the nearby river':
+					menu_off = 1
+					*clr & cla
+					gs 'exercise', 'tier1', 15, 'stren'
+					cumspclnt = 4 & gs 'cum_cleanup'
+					pcs_sweat = 10 + rand(0,4)
+					pcs_mood += 5
+					if pcs_inhib < 50:inhib_exp += rand(1,2)
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
+					'You wade in the river, splashing around with Mira is a lot of fun.'
+					if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-				act 'Continue':gt'gadfield','cow2'
+					act 'Continue':gt'gadfield','cow2'
+				end
 			end
 
 			act 'Tan by the river':

locations/moncheri.qsrc

@@ -216,14 +216,29 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
+	gs 'underwear_bodysuits', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'moncheri', 'changingroom'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbodysuitquality_filter
+
+		i = 1
 
-	:loopmoncheri_bodysuit
-		if moncheri_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		:loopmoncheri_bodysuit
+			if moncheri_bodysuits[i] = 0:
+				gs 'underwear_attributes', 'moncheri_bodysuits', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+				end
+			end
 		i += 1
-	if i <= 50:jump 'loopmoncheri_bodysuit'
+		if i <= 50:jump 'loopmoncheri_bodysuit'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbodysuitquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bodysuit2':
@@ -242,14 +257,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
-	i = 1
 
-	:loopmoncheri_shoes
-		if moncheri_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 140:jump 'loopmoncheri_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopmoncheri_shoes
+			if moncheri_shoe[i] = 0:
+				gs 'shoe_attributes', 'moncheri', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 140:jump 'loopmoncheri_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'moncheri_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'moncheri',i, 5000

locations/music_actions.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
       
 
     if $access ! 'denied': gs 'music_actions', 'set_up_account'
-    if $access ! 'denied': gs 'music_actions', 'upload_music'
+    !! if $access ! 'denied': gs 'music_actions', 'upload_music'
     gs 'music_actions', 'delete_music'
 
     act 'Finish': gs 'music_actions', 'finish'
@@ -84,7 +84,7 @@ end
 
 if $ARGS[0] = 'play_something':
     if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-        if  ml_not_alone = 0 or ml_willcost = 0:
+        if  ml_not_alone = 0 or will_cost = 0:
             !! TODO: This should be a new screen with some video or image or something
             act 'Play something on the guitar (10 minutes)':
                 *clr & cla
@@ -96,7 +96,7 @@ if $ARGS[0] = 'play_something':
                 'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
                 act 'Finish': gs 'music_actions', 'start' 
             end
-        elseif ml_willcost  <= pcs_willpwr:
+        elseif will_cost  <= pcs_willpwr:
             act 'Play something on the guitar (10 minutes) (<<will_cost>> Willpower - you are not alone)':
                 *clr & cla
                 inhib_exp += rand(1,2)
@@ -111,10 +111,10 @@ if $ARGS[0] = 'play_something':
                 act 'Finish': gs 'music_actions', 'start' 
             end
         else
-            act 'Practice guitar (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+            act 'Play something on the guitar (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
         end
     end
-    if  ml_not_alone = 0 or ml_willcost = 0:
+    if  ml_not_alone = 0 or will_cost = 0:
         act 'Sing something (10 minutes)':
             *clr & cla
             pcs_mood += 10
@@ -124,7 +124,7 @@ if $ARGS[0] = 'play_something':
             'You sway and move your head to keep the tempo, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
             act 'Finish': gs 'music_actions', 'start'
         end
-    elseif ml_willcost  <= pcs_willpwr:
+    elseif will_cost  <= pcs_willpwr:
         act 'Sing something (10 minutes) (<<will_cost>> Willpower - you are not alone)':
             *clr & cla
             inhib_exp += rand(1,2)
@@ -148,8 +148,8 @@ if $ARGS[0] = 'practice_guitar':
     if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc) and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0):
         if ml_time_left < 15:
             act 'Practice guitar (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today that your brain and hands are too tired to practice any more.</font>'    
-        elseif ml_not_alone ! 0 and ml_willcost ! 0:
-            if pcs_willpwr < ml_willcost:
+        elseif ml_not_alone ! 0 and will_cost ! 0:
+            if will_cost  <= pcs_willpwr:
                 act 'Practice guitar (15 minutes) (<<will_cost>> Willpower - you are not alone)':
                     inhib_exp += rand(1,2)
                     gs 'willpower', 'pay', 'self'
@@ -170,8 +170,8 @@ if $ARGS[0] = 'busking':
     'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
     if ml_time_left < 60:
         act 'Start busking (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to play a whole stream.</font>'
-    elseif  ml_willcost ! 0:
-        if ml_willcost <= pcs_willpwr:
+    elseif  will_cost ! 0:
+        if will_cost <= pcs_willpwr:
             act 'Start busking (60 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,3)
                 gs 'willpower', 'pay', 'self'
@@ -200,9 +200,9 @@ if $ARGS[0] = 'stream_music':
     elseif ml_time_left < 60:
         act 'Live stream (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to play a whole stream.</font>'    
     else
-        if ml_willcost = 0:
+        if will_cost = 0:
             act 'Live stream (60 minutes)': gt 'music_onlinemusic', 'live_stream'
-        elseif ml_willcost  <= pcs_willpwr:
+        elseif will_cost  <= pcs_willpwr:
             act 'Live stream (60 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,3)
                 gs 'willpower', 'pay', 'self'
@@ -227,9 +227,9 @@ if $ARGS[0] = 'record_music':
     
     if ml_time_left < 30:
         act 'Record a song (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to record anything right now.</font>'    
-    elseif ml_willcost = 0:
+    elseif will_cost = 0:
             act 'Record a song with your phone (30 minutes)': gt 'music_onlinemusic', 'record_song'
-    elseif ml_willcost  <= pcs_willpwr:
+    elseif will_cost  <= pcs_willpwr:
         act 'Record a song with your phone (30 minutes) (<<will_cost>> Willpower - you are not alone)':
             inhib_exp += rand(1,2)
             gs 'willpower', 'pay', 'self'
@@ -259,9 +259,9 @@ end
 !! practice the guitar parts too.
 if $ARGS[0] = 'rehearse_sets':
     if  ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
-        if  ml_not_alone = 0 or ml_willcost = 0:
+        if  ml_not_alone = 0 or will_cost = 0:
             act 'Rehearse your sets (30 minutes)': gt 'music_bedroompractice', 'rehearse'
-        elseif ml_willcost <= pcs_willpwr:
+        elseif will_cost <= pcs_willpwr:
             act 'Rehearse your sets (30 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,2)
                 gs 'willpower', 'pay', 'self'
@@ -284,9 +284,9 @@ end
 if $ARGS[0] = 'upload_music':
     !!Uploading recorded music if there are any not uploaded yet
     if ml_uploadablemusic > 0 and subscription[$access['subscription']] > 0 and ml_online['account'] = 1:
-        if ml_willcost = 0:
+        if will_cost = 0:
             act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
-        elseif ml_willcost <= pcs_willpwr:
+        elseif will_cost <= pcs_willpwr:
             act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
         else	
             act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -315,7 +315,7 @@ end
 
 !! TODO: Will modify to ask all three (''easy'', ''medium'' and ''hard'') because local (friends, family), public (strangers) and global (online)
 !! will have different inhibition thresholds
-!! IMPORTANT: I always try to add a check for skills, but the ml_willcost already includes Sveta''s performance ability! 
+!! IMPORTANT: I always try to add a check for skills, but the will_cost already includes Sveta''s performance ability! 
 if $ARGS[0] = 'willpower_cost':
     if pcs_inhib < 30:
         if pcs_inhib < 10:
@@ -326,18 +326,18 @@ if $ARGS[0] = 'willpower_cost':
             $diff = 'easy'
         end
         gs 'willpower', 'skill', 'self', $diff
-        ml_willcost = (will_cost * 3) - (pcs_perform)    
+        will_cost = (will_cost * 3) - (pcs_perform)    
     end
 end
 
 if $ARGS[0] = 'clear_restrictions':
-    killvar 'ml_willcost'
+    killvar 'will_cost'
     killvar 'ml_not_alone'
     killvar 'ml_no_music'
 end
 
 if $ARGS[0] = 'finish':
-    killvar 'ml_willcost'
+    killvar 'will_cost'
     killvar 'ml_not_alone'
     killvar 'ml_no_music'
     killvar 'ml_time_left'

locations/noticeboard.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'look':
 	if $set_imgh!'':givemeheight=val(mid($set_imgh,10,len($set_imgh)-9))/20 else givemeheight = 30
 	NumberOfNewAdverts = 0
 	$advert0 = func('noticeboard','test_advert0') 
-	$advert1 = func('noticeboard','test_advert1') 
+	if month > 8 and ml_guitarlesson['advertisement']  = 0: $advert1 = func('noticeboard','test_advert1') 
 	$advert2 = func('noticeboard','test_advert2') 
 	$advert3 = func('noticeboard','test_advert3') 
 	$advert4 = func('noticeboard','test_advert4') 
@@ -23,7 +23,7 @@ if $ARGS[0] = 'look':
 
 	$noticeboardmap = '<map name="noticemap">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert0>>" href="exec:gt ''noticeboard'', ''advert0''" alt="--0--">'
-	$noticeboardmap += '<area shape="rect" coords="<<$advert1>>" href="exec:gt ''noticeboard'', ''advert1''" alt="--1--">'
+	if month > 8 and ml_guitarlesson['advertisement']  = 0: $noticeboardmap += '<area shape="rect" coords="<<$advert1>>" href="exec:gt ''noticeboard'', ''advert1''" alt="--1--">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert2>>" href="exec:gt ''noticeboard'', ''advert2''" alt="--2--">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert3>>" href="exec:gt ''noticeboard'', ''advert3''" alt="--3--">'
 	$noticeboardmap += '<area shape="rect" coords="<<$advert4>>" href="exec:gt ''noticeboard'', ''advert4''" alt="--4--">'

locations/npcstatic4.qsrc

@@ -808,7 +808,7 @@ $npc_dna['A<<npctemp>>'] = '7169919752 7587835065 7871488903 1779229534 11591011
 $npc_firstname['A<<npctemp>>'] = 'Simeon'
 $npc_nickname['A<<npctemp>>'] = 'Syoma'
 $npc_lastname['A<<npctemp>>'] = 'Rodionov'
-$npc_usedname['A<<npctemp>>'] = 'Porn actor Simeon Rodionov'
+$npc_usedname['A<<npctemp>>'] = 'Porn actor Syoma Rodionov'
 $npc_notes['A<<npctemp>>'] = 'Simeon is an average man who worked as a clerk at a store in a small town before he quit and traveled to the city looking for something new. By chance, he met and bedded one of the studio''s actresses, who recommended that he try porn since he appeared to be inexhaustible in bed, capable of fucking for hours on end without rest.'
 npc_dob['A<<npctemp>>'] = 19891212
 npc_gender['A<<npctemp>>'] = 0

locations/panties.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'view_panty_list':
 		metka_panties = 2
 	end
 
-	gs 'panties', 'filter_header', 'store'
+	gs 'panties', 'filter_header'
 
 	'<center><table border=1><TH><a href="exec:gt ''panties'', ''view_panty_list'', ''wardrobe''">Draw</a></TH><TH><a href="exec:gt ''panties'', ''view_panty_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''panties'', ''view_panty_list'', ''unwanted''">Unwanted</a></TH></table></center>'
 
@@ -312,9 +312,9 @@ if $ARGS[0] = 'view_panty_item':
 						if dyneval('RESULT = <<$ARGS[2]>>_bras[<<underwear[''pair'']>>]') = 1:
 							'You own this bra and can wear this set.'
 							act 'Wear set':
-								if CloBra = 1:
+								if PCloBra = 1:
 									msg'You cannot wear a bra with this top'
-								elseif CloPanties = 1:
+								elseif PCloPanties = 1:
 									msg'You cannot wear a panties with this outfit'
 								else
 									if hypnoBra > 0 and hypnoPanty > 0:
@@ -603,27 +603,9 @@ if $ARGS[0] = 'filter_header':
 	end
 
 
-	$Headerstring[2] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Include</TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH><TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Sort by</TH><TH></TH>'
+	$Headerstring[2] = '<TH>Include</TH><TH>Sort by</TH><TH></TH>'
 
-	$Headerstring[3] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	$Headerstring[3] += '<TH>Only show</TH>'
+	$Headerstring[3] = '<TH>Only show</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
 	'<TR><border=1><<$Headerstring>>'
@@ -655,16 +637,8 @@ if $ARGS[0] = 'panty_filter':
 end
 
 if $ARGS[0] = 'shop_filter_header':
-!! exclude filters
-	$Headerstring = '<TD>'
-	if clothingfilter['sport'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	end
-
 !! sort by filters
-	$Headerstring += '<TD>'
+	$Headerstring = '<TD>'
 	if clothingfilter['number'] = 0:
 		clothingfilter['quality'] = 1
 		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
@@ -679,40 +653,17 @@ if $ARGS[0] = 'shop_filter_header':
 		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
 	end
 
-!! Show only filers
-	$Headerstring[1] = '<TD>'
-	if clothingfilter['sport_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	end
-
 
-	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH><TH>Include</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
-
-	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH><TH>Only show</TH>'
+	$Headerstring[2] = '<TH>Sort by</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
 	'<TR><border=1><<$Headerstring>>'
 
-	'<TR><border=0><<$Headerstring[3]>>'
-	'<TR><border=1><<$Headerstring[1]>></table></center>'
+	'</table></center>'
 end
 
 if $ARGS[0] = 'shop_filter':
-!!Exclude filters
-	clothingfilter['inc'] = 1
-	!!filters, if inc set to 0 they will not display
-	if clothingfilter['sport'] = 1 and PanFun = 2:
-		clothingfilter['inc'] = 0
-	end
 
-!!only filters
-	clothingfilter['only'] = 0
-	!!filters, if only set to 1 they will only display those set
-	if clothingfilter['sport_only'] = 1 and PanFun = 2:
-		clothingfilter['only'] += 1
-	end
 end
 
 --- panties ---------------------------------

locations/pav_commclubs.qsrc

@@ -81,7 +81,7 @@ if hour >= 12 and hour < 20:
 		act 'Enquire about the guitar lessons': gt 'music_guitarlesson', 'enquiry'
 	end
 
-	if  ml_guitarlesson['lessonday']  = 8:
+	if  ml_guitarlesson['enquired'] = 1 and ml_guitarlesson['lessonday']  = 8:
 		act 'Arrange a lesson day': gt 'music_guitarlesson', 'setlessonday'
 	end
 

locations/pav_lake.qsrc

@@ -169,8 +169,10 @@ if $ARGS[0] = '':
 		end
 		
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
-			act 'Go for a swim in the lake':
-				gt 'pav_lake', 'swimming'
+			if pcs_stam >= (10 * (10 - sport_clothes_exercise_bonus)) / 2:
+				act 'Go for a swim in the lake':
+					gt 'pav_lake', 'swimming'
+				end
 			end
 			
 			if sunWeather = 1:

locations/pav_lake_nude.qsrc

@@ -158,37 +158,39 @@ if temper >= 15 and month >= 5 and month <= 9:
 	end
 	
 	if hour >= 6 and hour <= 20 and (PCloswimwear = 1 or $clothingworntype = 'nude'):
-		act 'Go swimming':
-			menu_off = 1
-			cumspclnt = 4
-			gs 'cum_cleanup'
-			minut += 30
-			pcs_mood += 5
-			! Seems appropriate. Potentially worth revisiting
-			if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-			if PCloswimwear = 1:
-				if pcs_inhib < 50:inhib_exp += 1
-			elseif $clothingworntype = 'nude':
-				inhib_exp += rand(1,3)
-			end
-			if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
-			if pcs_stren < 30: gs 'exp_gain', 'stren', 1
-			fat -= 1
-			pcs_makeup = 1
-			gs 'stat'
-			*clr & cla
-			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
-				if pcs_inhib < 60:inhib_exp += rand(0,1)
-				'You play around and have fun in the lake, enjoying the feeling of the warm water on your naked body. The water refreshes and invigorates you.'
-			else
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
-				if pcs_inhib < 40:inhib_exp += rand(0,1)
-				'You play around and have fun in the lake, its a bit liberating to see so many people here naked. The water refreshes and invigorates you.'
-			end
-			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
+			act 'Go swimming':
+				menu_off = 1
+				cumspclnt = 4
+				gs 'cum_cleanup'
+				minut += 30
+				pcs_mood += 5
+				! Seems appropriate. Potentially worth revisiting
+				if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
+				if PCloswimwear = 1:
+					if pcs_inhib < 50:inhib_exp += 1
+				elseif $clothingworntype = 'nude':
+					inhib_exp += rand(1,3)
+				end
+				if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
+				if pcs_stren < 30: gs 'exp_gain', 'stren', 1
+				fat -= 1
+				pcs_makeup = 1
+				gs 'stat'
+				*clr & cla
+				if $clothingworntype = 'nude':
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_nude_<<rand(0,10)>>.jpg"></center>'
+					if pcs_inhib < 60:inhib_exp += rand(0,1)
+					'You play around and have fun in the lake, enjoying the feeling of the warm water on your naked body. The water refreshes and invigorates you.'
+				else
+					'<center><img <<$set_imgh>> src="images/pc/activities/swim/lake/swim_bikini_<<rand(0,8)>>.jpg"></center>'
+					if pcs_inhib < 40:inhib_exp += rand(0,1)
+					'You play around and have fun in the lake, its a bit liberating to see so many people here naked. The water refreshes and invigorates you.'
+				end
+				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Get out of the water': gt 'pav_lake_nude'
+				act 'Get out of the water': gt 'pav_lake_nude'
+			end
 		end
 	end
 	

locations/pav_lake_nude_events.qsrc

@@ -44,7 +44,7 @@ if $args[0] = 'pav_lake_nude_sex':
 						*clr
 						minut += 7
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_5.jpg"></center>'
-						'After several minutes frolicking in the lake, you see the girl wlking out of the water. As soon as she reaches the comfort of the warm sand she suddenly falls on all fours, her tight holes displayed like a wanton whore as she wiggles her ass. The man smirks and moves towards her, making it abundantly clear that she doesn''t have to say a word.'						
+						'After several minutes frolicking in the lake, you see the girl walking out of the water. As soon as she reaches the comfort of the warm sand she suddenly falls on all fours, her tight holes displayed like a wanton whore as she wiggles her ass. The man smirks and moves towards her, making it abundantly clear that she doesn''t have to say a word.'						
 						gs 'stat'
 						act 'Further':
 							cla

locations/photography_work.qsrc

@@ -0,0 +1,216 @@
+# photography_work
+
+!! 05-2023 - First Draft
+!! Conversion from dynamic arrays to sub-functions to reduce save footprint
+
+!! job offer init:
+
+if $ARGS[0] = 'photojob_pay':
+	if pcs_photoskl > 125:
+		gs 'emp_functions', 'wage_evt', 4
+	elseif pcs_photoskl > 100:
+		gs 'emp_functions', 'wage_evt', 3
+	elseif pcs_photoskl > 75:
+		gs 'emp_functions', 'wage_evt', 2
+	elseif pcs_photoskl > 50:
+		gs 'emp_functions', 'wage_evt', 1
+	else
+		gs 'emp_functions', 'wage_evt', 5, 100
+	end
+end
+
+!! Photography jobs functions
+
+
+if $ARGS[0] = 'job_init':
+	!! Set up arrays if not initialised
+	if $evt_job[1] = '' :  gs 'emp_functions', 'job_evt'
+    !! ensure it matches total jobs on offer
+	 evt_PhotoID = rand(1, 5)
+	gs 'photography_work', 'job_' + evt_PhotoID
+	!! set Day of Week for job to appear on	
+	transient_evt_dow = 6
+    !! Now set up the event date
+    gs 'photography_work' , 'photojob_pay'
+    !! Set job duration of 2-4 hours
+    transient_evt_duration = rand(2,4)
+    gs 'emp_functions', 'gen_evt'
+end
+
+!! Event player:
+
+if $ARGS[0] = "evt_stage" or $ARGS[0] = '':
+    !! Track how many gigs completed
+    photography['experience'] += 1
+    karta += evt_wages[act_idx]
+	gs 'stat'
+   !! runs all events:
+    gt 'photography_work', 'stage_' + evt_event_sub[act_idx]
+
+end
+
+!! These are the event stages to play the events, should be equal to the amount of jobs
+
+if $ARGS[0] = 'stage_1':
+    *clr & cla
+	minut += 20
+	gs 'stat'
+	'<center><img src="images/characters/shared/headshots_generic/37.jpg"></center>'
+	'You head over to the industrial region where you quickly meet up with your contact at the Experience Center.'
+	'"Hi there; you must be <<$pcs_firstname>>. The group is already on their way to the site, so I''ll take you up there in my car. I''m sure you know everything you need to do, but feel free to ask if you have any questions."'
+	'You get in the car and drive for nearly half an hour until you reach the Experience Center. Once there, the representative parks the car and you get out and head inside.'
+	act 'Go to the Experience Center':
+		*clr & cla
+		minut += rand(120,150)
+		gs 'exp_gain', 'photoskl', rand(6,10)
+		gs 'stat'
+		gs 'shop_photography', 'photojob_pay'
+		'<center><img src="images/pc/activities/photography/job/tank.jpg"></center>'
+		'You arrive at the Experience Center and spend the next two hours taking as many pictures of the experience as you can. The group is clearly enjoying the event; They get to ride in military vehicles across rough terrain and fire weapons at the shooting range.'
+		'Once the day is over, you remove your SD card and hand it to the representative, who shows the photos to the group. Once they''ve sorted out whether any of the customers want additional copies, your contact takes you back to the city''s industrial region. When you check your account, you see that you have been paid <<evt_wages[act_idx]>>.'
+		!! gs 'shop_photography', 'photojob_cleanup'
+		act 'Return': gt $loc, $loc_arg
+	end
+end
+
+if $ARGS[0] = 'stage_2':
+    *clr & cla
+	minut += rand(60,90)
+	gs 'exp_gain', 'photoskl', rand(3,5)
+	gs 'stat'
+	gs 'shop_photography', 'photojob_pay'
+	'<center><img src="images/pc/activities/photography/job/model<<rand(1,3)>>.jpg"></center>'
+	'You go to the Petrovskaya Akvatoria Model Museum to take pictures of the various exhibits on behalf of an international newspaper.'
+	'After a brief introduction to a member of staff to confirm your activities, you walk around the exhibit, taking a large number of photographs so that the article has a wealth to choose from.'
+	'Once you''re finished, you return to the shop and hand the SD card to Branko, who gives you your fee of <<evt_wages[act_idx]>>₽.'
+	!! gs 'shop_photography', 'photojob_cleanup'
+	act 'Return' : gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'stage_3':
+    *clr & cla
+	minut += rand(10,18)
+	gs 'stat'
+	'<center><img src="images/characters/shared/headshots_generic/18.jpg"></center>'
+	'You head over to the residential district where you meet one of the family members of the betrothed.'
+	'"Hello, you must be the photographer! If you follow me, I''ll take you to the happy couple to take the pictures of them."'
+	act 'Follow':
+		*clr & cla
+		minut += rand(90,120)
+		gs 'exp_gain', 'photoskl', rand(6,10)
+		gs 'stat'
+		gs 'shop_photography', 'photojob_pay'
+		'<center><img src="images/pc/activities/photography/job/wedding.jpg"></center>'
+		'You meet the bride and groom and help direct them into a number of framed situations for you to take some beautiful photos of them together.'
+		'Once you have enough, you spend the rest of the day in the background taking a number of photos of the wedding. Once it''s over, you meet back up with the relative who takes the SD card from you.'
+		'Leaving them to close up the venue, you walk out back into the residential district. When you check your account, you see that you have been paid <<evt_wages[act_idx]>>.'
+		!! gs 'shop_photography', 'photojob_cleanup'
+		act 'Return' : gt $loc, $loc_arg
+	end
+end
+
+if $ARGS[0] = 'stage_4':
+    *clr & cla
+	minut += rand(15,20)
+	gs 'stat'
+	'<center><img src="images/characters/shared/headshots_generic/11.jpg"></center>'
+	'You head over to the industrial region and meet a representative of the Autodrome. You will be expected to take pictures of the event and deliver them to your contact.'
+	'"Why hello there, you must be the person Branko sent. I''m sure you already know everything you have to do at the track, so I''ll give you this press pass and take you to the Autodrome."'
+	'You look at the pass they gave you before getting in their car to be taken to the track.'
+	act 'Go to the Autodrome':
+		*clr & cla
+		minut += rand(180,240)
+		gs 'exp_gain', 'photoskl', rand(9,15)
+		gs 'stat'
+		gs 'shop_photography', 'photojob_pay'
+		'<center><img src="images/pc/activities/photography/job/motorsport.jpg"></center>'
+		'You''re dropped off at the employee entrance and directed to the pit area as the teams get their vehicles prepared.'
+		'You start off by getting shots of the teams in the build-up to the race, showcasing the tension and focus as the countdown approaches zero.'
+		'When the race itself starts you roam the track, taking pictures of any event as it happens, getting high intensity shots of fast paced action, as well as the smooth professionalism of the leading drivers. It is a fantastic experience.'
+		*nl
+		'With your job done, you find your contact again and hand them a full SD card for which they are gratified.'
+		'Your contact then takes you back to the city''s industrial region. When you check your account, you see that you have been paid <<evt_wages[act_idx]>>.'
+		!! gs 'shop_photography', 'photojob_cleanup'
+		act 'Return' : gt $loc, $loc_arg
+	end
+end
+
+if $ARGS[0] = 'stage_5':
+    *clr & cla
+	minut += 60
+	gs 'exp_gain', 'photoskl', rand(3,5)
+	gs 'stat'
+	gs 'shop_photography', 'photojob_pay'
+	'<center><img src="images/pc/activities/photography/job/court.jpg"></center>'
+	'"You need to go to the courthouse to take publicity photographs of the completed court session as they leave the building, then deliver them back to me to give you your commission."'
+	'You head into the City Center and straight to the courthouse, which has already seen a number of people turn up.'
+	'Once you''ve ingratiated yourself into the crowd, you position yourself to take some good shots of the plaintiff accompanied by their lawyers and representatives.'
+	'With the verdict read, you quickly make your way outside to the front of the courthouse to take photos of him leaving.'
+	'Once you''re finished, you return to the shop and hand the SD card to Branko, who gives you your fee of <<evt_wages[act_idx]>>₽.'
+	!! gs 'shop_photography', 'photojob_cleanup'
+	act 'Return' : gt $loc, $loc_arg
+end
+
+! Array of photography jobs - additional events should be easy to wire up
+if $ARGS[0] = 'job_1':
+	!!Ensure the event is visible in journal:
+	transient_evt_silent = 1
+	!! Set the job type as per list
+	transient_evt = 1
+	transient_evt_sub = 1
+	$photojob_shortname = 'Tank'
+	$transient_desc = 'Tank and Bazooka Experience Day in Levingrad Oblast'
+	!! Field for trigger location
+	$transient_loc = 'city_industrial'
+	$transient_arg = ''
+	!! Journal loc description
+	$transient_journal = 'Travel to St Petersburg Industrial Area'
+
+end
+
+if $ARGS[0] = 'job_2':
+	transient_evt_silent = 1
+	transient_evt = 1
+	transient_evt_sub = 2
+	$photojob_shortname = 'Model'
+	$transient_desc = 'Newspaper Commission at Petrovskaya Akvatoria'
+	$transient_loc = 'shop_photography'
+	$transient_arg = 'evt_stage'
+	$transient_journal = 'Meet Branko at the Photography Shop'
+end
+
+if $ARGS[0] = 'job_3':
+	transient_evt_silent = 1
+	transient_evt = 1
+	transient_evt_sub = 3
+	$photojob_shortname = 'Wedding'
+	$transient_desc = 'Wedding at Yelagin Palace'
+	$transient_loc = 'city_residential'
+	$transient_arg = ''
+	$transient_journal = 'Travel to St Petersburg Residential Area'
+end
+
+if $ARGS[0] = 'job_4':
+	transient_evt_silent = 1
+	transient_evt = 1
+	transient_evt_sub = 4
+	$photojob_shortname = 'Motorsport'
+	$transient_desc = 'Russian Touring Car Championship Event at St. Petersburg Autodrome'
+	$transient_loc = 'city_industrial'
+	$transient_arg = ''
+	$transient_journal = 'Travel to St Petersburg Industrial Area'
+
+end
+
+if $ARGS[0] = 'job_5':
+	transient_evt_silent = 1
+	transient_evt_ = 1
+	transient_evt_sub = 5
+	$photojob_shortname = 'Court'
+	$transient_desc = 'Press Event at City Courthouse'
+	$transient_loc = 'shop_photography'
+	$transient_arg = 'start'
+	$transient_journal = 'Meet Branko at the Photography Shop'
+end
+
+--- photography_work ---------------------------------

locations/pornfilm.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'pornactor':
 				$pactor[num] = 'Ignat Vedenin'
 				$pactorID[num] = 'A196'
 			elseif akrand = 5:
-				$pactor[num] = 'Simon Rodionov'
+				$pactor[num] = 'Syoma Rodionov'
 				$pactorID[num] = 'A197'
 			elseif akrand = 6:
 				$pactor[num] = 'Vasya Harkov'

locations/pornstudio.qsrc

@@ -50,14 +50,13 @@ if $ARGS[0] = 'start':
 				minut += 5
 				workDisk = 2
 				gs 'stat'
-				'You are given a thumb drive, and asked if you remember all the instructions. You quietly nod and leave.'
-				'As you leave the studio, you hear someone exit a nearby building and start following you.'
-				'You reassure yourself and carry on.'
+				'You''re given a thumb drive and asked if you remember all the instructions. You quietly nod and leave.'
+				'As you leave the studio, you hear someone exit a nearby building and start following you, but you reassure yourself and carry on.'
 
 				act 'Leave': gt 'city_redlight', 'start'
 			end
 		elseif workDisk = 3 and week = 5:
-			act 'Give the envelope':
+			act 'Hand over the envelope':
 				cla
 				menu_off = 1
 				minut += 5
@@ -114,7 +113,7 @@ if $ARGS[0] = 'pa':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'"Is it possible for me to change my stage name?"'
+				'"Is it possible for me to change my stage name?" you ask.'
 				'"Of course! Just give me a minute to register it in the database. So, what would you like to be called?" he replies.'
 				act '"I want to be called..."':
 					$pfname = input("Enter the name you want to be known as.")
@@ -133,17 +132,17 @@ if $ARGS[0] = 'pa':
 				'"You''ve made <<film>> films."'
 
 				if porn_fame < 10:
-					'"Nobody knows your name. You''re one of hundreds of amateur actresses who only play minor roles in big movies. Your own movies sold really cheap."'
+					'"Nobody knows your name. You''re one of hundreds of amateur actresses whose fims are sold really cheap."'
 				elseif porn_fame < 20:
-					'"You''re still unknown, but your name is mentioned in the credits. You''re unlikely to be recognized, and your own movies are still sold cheap."'
+					'"You''re still unknown and are unlikely to be recognized. Your own films are still sold cheap."'
 				elseif porn_fame < 40:
-					'"You''re mentioned here and there, but you still mostly get secondary roles in most of your movies. Your name is slowly emerging and you have your own fanbase."'
+					'"You''re mentioned here and there, but still mostly get minor roles. Your name is slowly emerging and you have your own fanbase."'
 				elseif porn_fame < 60:
-					'"You''re a minor, but known porn actress. You get the occasional primary role and back cover appearance. Your movies are getting more popular, which means more fans and more money."'
+					'"You get the occasional back cover appearance and your films are getting more popular, which means more fans and more money."'
 				elseif porn_fame < 80:
-					'"You''re a known porn actress who mostly plays primary roles, and you appear on the front cover. Your movies are sold at a decent price, and in big numbers. You may also appear in a variety of adult magazines."'
+					'"You''re a known porn actress who appears on the front cover. Your films are sold at a decent price, and in big numbers."'
 				else
-					'"You''re a famous porn starlet and always play the main role. You''re a brand name, with sex toys and T-shirts among the items sold as part of your own line of merchandise."'
+					'"You''re a very well known porn actress and your films are sold at a premium. You''re likely to recieve offers to work with renowned studios and producers."'
 				end
 
 				if porn_fame >= 20:
@@ -199,7 +198,7 @@ if $ARGS[0] = 'pa':
 						films_stop_payment = film * 40000
 						gs 'stat'
 						'"Seeing as you''re not well known, it''s unlikely anyone would notice. However, to remove them you''d have to cover the loss of the studio''s profits- 40,000 <b>₽</b> per film. That''s a total of <<films_stop_payment>> <b>₽</b>."'
-						'"Also, it would piss off your co-stars and director, and likely end your porn career. You should also know that there''s no guarantee that there''s no other copies of your movies out there anyway, so think carefully."'
+						'"Also, it would piss off your co-stars and director, and likely end your porn career. You should also know that there''s no guarantee there''s no other copies out there, so think carefully."'
 
 						if money >= films_stop_payment:
 							act 'Remove them':
@@ -242,7 +241,7 @@ if $ARGS[0] = 'delivery':
 	minut += 15
 	menu_off = 1
 	gs 'stat'
-	'"We made inquiries about you, and everything seems in order. Essentially, we give you a thumb drive, you deliver it to the sauna, they give you an envelope and you bring it to us. Immediately."'
+	'"We made inquiries about you, and everything seems in order. In short, we give you a thumb drive and you deliver it to the sauna. They give you an envelope and you bring it to us. Immediately."'
 	'"Upon delivery of the envolope, you get 5000 <b>₽</b>. Deliveries are available every Friday, after the studio has opened. If you agree, then visit any Friday, and choose a safe mode of transport."'
 
 	act 'Disagree':bomzQW = -1 & gt 'city_redlight', 'start'
@@ -268,7 +267,7 @@ if $ARGS[0] = 'delivery':
 				'This sauna is located near your home. You find it strange that you didn''t notice it before.'
 			end
 
-			'You go to the sauna, and are introduced to the local managers. It''s explained to you who you need to deliver to, and are reminded that it is necessary to return the envelope the same day you receive it.'
+			'You''re introduced to the local managers and it''s explained to you who you need to deliver to. You''re also reminded that it''s necessary to return the envelope the same day you receive it.'
 			'"Don''t forget to use secure transport. We''ll see you on Fridays. <i>Don''t</i> fuck up."'
 
 			act 'Leave':bomzQW = 2 & gt 'city_residential'
@@ -322,7 +321,6 @@ if $ARGS[0] = 'manager':
 	'You walk into the manager''s office and find Dimitri at his desk.'
 
 	if firstkasting = 0: gt 'pornstudio', 'first'
-
 	if pregchem >= 2688 and pregtalkpornstudio = 0: gt 'pornstudio', 'pregreact'
 
 	if pfilmNoVenera = 1:
@@ -399,7 +397,7 @@ if $ARGS[0] = 'manager':
 	 !! Your first movie offer
 		if firstoffer = 0:
 			firstoffer = 1
-			if tits >= 5: 
+			if tits >= 4: 
 				'"So you''re the new girl, huh? As luck would have it, we''re looking for someone fresh for our next shoot. It''s called ''Girls Jerk Guys #36''. For 500 <b>₽</b>, you would jerk a guy off and have him cum on your tits. However, in your case, you''ll be using those puppies instead. Titfucking is a market we want to break into," he says while looking at your well endowed chest.'
 				'"You should also know that this particular shoot is booked with Egor, one of our more... experienced actors. He''s rather... proud of being in this line of work."'
 			else
@@ -407,7 +405,7 @@ if $ARGS[0] = 'manager':
 				'"You should also know that this particular shoot is booked with Egor, one of our more... experienced actors. He''s rather... proud of being in this line of work."'
 			end
 		else
-			if tits >= 5:
+			if tits >= 4:
 				'"Hello. Since you''re new, all I can offer you is an introductory movie called ''Girls Jerk Guys #36''. For 500 <b>₽</b>, you would jerk a guy off and have him cum on your tits. However, in your case, you''ll be using those puppies instead. Titfucking is a market we want to break into," he says while looking at your well endowed chest.'
 				'"You should also know that this particular shoot is booked with Egor, one of our more... experienced actors. He''s rather... proud of being in this line of work."'
 			else
@@ -799,14 +797,18 @@ if $ARGS[0] = 'yes':
 	'You confirm your enthusiasm to be in porn and he nods. "Let''s see your papers. You are 18 or older, yes?"'
 	if age >= 18 and age < 20:
 		'"Yes I am," you answer while handing him your passport.'
-		'He looks it over with a grin. "A teen, huh? Perfect. You need to do a casting first. Take off your clothes."'
-	elseif age >= 18:
+		'He looks it over with a smirk. "A teen, huh? Perfect. You need to do a casting first, so take off your clothes."'
+	elseif age >= 20 and age < 25:
+		'"Yes I am," you answer while handing him your passport.'
+		'He looks it over and nods. "Looks good, but you need to do a casting first. Take off your clothes."'
+	elseif age >= 25:
 		'"Yes I am," you answer while handing him your passport.'
-		'He looks it over and nods. "Looks good. You need to do a casting first. Take off your clothes."'
+		'He looks it over and frowns. "You''re a bit old to start doing porn, no?"'
+		'"What do you mean?" you ask with a frown.'
+		'"Most of our girls started when they were 18. The oldest was 20," he replies. "We can work with you, but you need to do a casting first. Take off your clothes."'
 	elseif fakepassport = 1:
 		'"Yes I am," you answer while handing him your fake passport.'
-		'You see him frown as he checks your passport with suspicion.'
-		'"Well, I guess everything is in order. You need to do a casting first. Take off your clothes."'
+		'You see him frown as he checks your passport with suspicion. "You need to do a casting first. Take off your clothes."'
 	else
 		'"Nearly..." you plead.'
 		'"Right... Come back when you''re old enough, kid."'
@@ -835,10 +837,10 @@ if $ARGS[0] = 'yes':
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/studio_porn/casting/casting2.jpg"></center>'
 				'You lie down on the sofa and spread your legs as he takes a few pictures, explaining that they''re for your portfolio.'
 				if tits >= 4:
-					'"Are these puppies real?" he asks while fondling one of your large breasts in his hand with an approving grin.'
-					if age < 20: '"A big tit teen is the kind of fresh talent we''re looking for right now."'
-				elseif tits <= 2:
-					'He stares at your clear lack of sizeable breasts while muttering something to himself. "No worries. We can work with these."'
+					'"Are these puppies real?" he asks while fondling one of your large breasts in his hand with an approving grin. "These things bouncing around as you get fucked will certainly draw in the views."'
+					if age < 20: '"A big tit teen like you is who studios dream of signing on. Those puppies are going to make you <i>very</i> popular, and not just with the viewers."'
+				elseif tits < 2:
+					'He notices your clear lack of sizeable breasts. "No worries. Small tits are just as popular in porn as big ones."'
 				else
 					'"Nice tits. Always good to give the viewers something to look at," he smiles while fondling one of your breasts in his hand.'
 				end
@@ -857,7 +859,7 @@ if $ARGS[0] = 'yes':
 					'"Turn around," he orders and you get on all fours and show him your bubble butt. "Nice," he says while squeezing it in his hand and taking some pictures. "I highly recommend doing anal if you have an ass like this."'
 					if tits >= 4 and age < 20: 
 						'"A teen with big tits and a nice bubble butt. You really are the perfect little porn star in the making," he says with a grin.'
-					elseif tits >= 5:
+					elseif tits >= 4:
 						'"Big tits and a bubble butt? You really are the complete package," he says with a grin.'
 					end
 				end
@@ -1063,12 +1065,12 @@ if $ARGS[0] = 'postvideo':
 		end
 	else
 		if $pstory = '' and editpornname = 1:
-			$pornfilmstory[film] = input('You can enter the story of the porn movie. This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
+			$pornfilmstory[film] = input('You can enter the story for the film. This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)<br>Tags of the current movie: <font color=#541717 size=2><<$pfilmtags>></font>')
 		else
 			$pornfilmstory[film] = $pstory
 		end
 		if editpornname = 1:
-			$porntitle[film] = input("Enter the name of the porn movie. <i>This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
+			$porntitle[film] = input("Enter the name of the film. <i>This action can only be done once, but you can choose to do it later! (Just hit Enter/Esc when blank)</i>")
 		end
 	end
 
@@ -1114,27 +1116,27 @@ if $ARGS[0] = 'postvideo':
 	if pfType ! 0:
 		unprotfilm = -1
 		if succubusflag = 1:
-!!			May add a check to clear unprotfilm based on sucpcinfo (the PC knows Succubae are immune to STDs)
+			!!May add a check to clear unprotfilm based on sucpcinfo (the PC knows Succubae are immune to STDs)
 			if pfcash > 0:
 				$tmp = '"I almost can''t believe they paid me <<pfcash>><b>₽</b> for such a wonderful meal!"'
 			else
 				$tmp = '"And they think I''m doing this for free. If only they knew they were paying me in another way..."'
 			end
-			'You let slip a satisfied smirk and think to yourself, <<$tmp>>'
+			'<<$tmp>> you think to yourself as you smirk in satisfaction.'
 		elseif knowpreg = 0 and thinkpreg = 0 and pillcon2 < 1000:
 			pornDanger[film] = 1
-!!			Left "ppreg" pending its eventual use
+			!!Left "ppreg" pending its eventual use
 			if ppreg = 0:
 				if pfcash > 0:
-					$tmp = ' Was <<pfcash>> <b>₽</b> worth the risk of getting impregnated by a seedy porn actor you''ll probably never see again?'
+					$tmp = 'Was <<pfcash>> <b>₽</b> worth the risk of getting impregnated by a seedy porn actor you''ll probably never see again?'
 				else
 					$tmp = 'You didn''t even get paid to risk pregnancy! You''ll likely never see the guy again.'
 				end
-				'With a growing sense of horror, you realize that you aren''t on the shot and have no idea when you last took a birth control pill.<<$tmp>>'
+				'With a growing sense of horror, you realize that you aren''t on the shot and have no idea when you last took a birth control pill. <<$tmp>>'
 			else
 				!{If she has birth control and deliberately isn''t using it, obviously she wants to get pregnant or just doesn''t care.}
 				if pfcash > 0:
-					$tmp = 'Either way, <<pfcash>> <b>₽</b> will definitely help make a better life for you and your baby if you end up pregnant.'
+					$tmp = 'Either way, <<pfcash>> <b>₽</b> will definitely help make a better life for you and your baby if you do end up pregnant.'
 				else
 					$tmp = 'The fact that you weren''t even paid to take this risk excites you more than you''d like to admit.'
 				end
@@ -1283,7 +1285,7 @@ end
 
 if $ARGS[0] = 'pregreact':
 	'"Wow. I''m surprised you still want to do the shoot considering how far along you are. The good news is, we''ve been looking into appealing to people with different fetishes, so this is the perfect opportunity to start marketing to pregnancy fetishists. However, this is also going to change the shoots you can do."' 
-	'"You see, this is more of a niche thing and not something we can really use for wide appeal. You can still work, but only on specific pregnancy shoots, so you might not get the same amount of work you got before. Don''t worry though, if we can find a way to make money off of you, we definitely will." the manager ends with a smile.'
+	'"You see, this is more of a niche thing and not something we can really use for wide appeal. You can still work, but only on specific pregnancy shoots, so you might not get the same amount of work you got before. Don''t worry; if we can find a way to make money off of you, we definitely will," Dimitri says with a smile.'
 	act 'Continue': pregtalkpornstudio = 1 & gt 'pornstudio', 'manager'
 end
 

locations/pushkin.qsrc

@@ -3,7 +3,6 @@
 *clr & cla
 gs 'shortgs', 'setloc', 'pushkin', $ARGS[0]
 $region = 'puskin'
-$menu_arg = ''
 menu_off = 0
 if sound = 0:PLAY 'sound/street.mp3',30
 gs'stat'

locations/saveupdater.qsrc

@@ -1685,10 +1685,13 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	end
 end
 
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080903:
-
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00090000:
+	if photography_job >0:
+		photography['experience'] = photography_job & killvar 'photography_job'
+	end
 end
 
+
 gs 'saveg'
 --- saveupdater ---------------------------------
 

locations/sex_ev_cowgirl.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'cowgirl_start':
 			act'Ride him hard':gt 'sex_ev_cowgirl', 'cowgirl3'
 		end
 		
-	elseif sex_ev['initiative'] ! 1 or sex_ev['force_initiative'] = 2:
+	elseif sex_ev['initiative'] ! 1 and sex_ev['force_initiative'] ! 1:
 		act'Continue':
 			cla & *clr
 			sex_ev['cock_inserted'] = 1

locations/sex_ev_cum.qsrc

@@ -580,7 +580,7 @@ if $ARGS[0] = 'fuck_cum':
 		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
 	elseif sex_ev['his_choice'] = 2:
 		act'Continue':gt 'sex_ev_cum', 'cum_his_choice'
-	else
+	elseif sex_ev['boy_cum'] > 0:
 		*nl
 		'Tell hornguy6 that the fuck_cum failsafe activated.'
 		act'Continue':gt 'sex_ev_cum', 'cum_pullout'
@@ -1450,36 +1450,24 @@ if $ARGS[0] = 'creampie_menu':
 					sex_ev['he_ask_creampie_yes'] = 1 & gs 'sex_ev_cum', 'cum_together'
 				end
 			else
-				act'Let''s come together':
-					cla & *nl
-					if sex_ev['cum_where'] = 1:
-						if $sex_ev['position'] = 'miss':
-							'"Let''s come together," you say, smiling warmly into his eyes.'
-						elseif $sex_ev['position'] = 'doggy':
-							'"Let''s come together," you say, giving him a warm smile over your shoulder.'
-						elseif $sex_ev['position'] = 'cowgirl':
-							'"Let''s come together," you say, leaning down to smile warmly into his eyes.'
-						end
-					else
-						if $sex_ev['position'] = 'miss':
-							'"Let''s come together instead," you say, smiling warmly into his eyes.'
-						elseif $sex_ev['position'] = 'doggy':
-							'"Let''s come together instead," you say, giving him a warm smile over your shoulder.'
-						elseif $sex_ev['position'] = 'cowgirl':
-							'"Let''s come together instead," you say, leaning down to smile warmly into his eyes.'
-						end
-					end
-					sex_ev['creampie_ask'] = 1 & gs 'sex_ev_cum', 'cum_together'
-				end
+				act'Let''s come together': sex_ev['creampie_ask'] = 1 & gs 'sex_ev_cum', 'cum_together'
 			end
 		else
 			act'Fill me up!':
 				cla & *nl
 				sex_ev['creampie_ask'] = 1
-				if sex_ev['speed'] ! 3:
-					'"Come inside me," you smile. "Fill me up."'
+				if sex_ev['he_ask_creampie'] = 1:
+					if sex_ev['speed'] ! 3:
+						'"Do it," you smile. "Fill me up."'
+					else
+						'"Do it!" you cry. "Fill me up!"'
+					end
 				else
-					'"Come inside me!" you cry. "Fill me up!"'
+					if sex_ev['speed'] ! 3:
+						'"Come inside me," you smile. "Fill me up."'
+					else
+						'"Come inside me!" you cry. "Fill me up!"'
+					end
 				end
 				act'Continue':gt 'sex_ev_cum', 'cum_inside'
 			end

locations/sex_ev_doggy.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'doggy_start':
 			end
 			act'Keep fucking':gs'sex_ev_doggy', 'doggy_goto'
 		end
-	elseif sex_ev['initiative'] ! 1 or sex_ev['force_initiative'] = 2:
+	elseif sex_ev['initiative'] ! 1 and sex_ev['force_initiative'] ! 1:
 		gs 'sex_ev_sex', 'speed_select'
 		act'Continue':
 			sex_ev['cock_inserted'] = 1

locations/sex_ev_leave.qsrc

@@ -107,12 +107,12 @@ if $ARGS[0] = 'leaving_dialogue':
 			gs'sex_ev_leave', 'leaving_action'
 		end
 		
-		if npc_sex_ev_date[$boy] = daystart and sex_ev['sleepover'] = 1:
+		if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1:
 			act'"See you soon"':
 				$sex_ev['leave_dialogue'] = 'See you soon'
 				gs'sex_ev_leave', 'leaving_action'
 			end
-		elseif npc_sex_ev_date[$boy] = daystart + 1:
+		elseif npc_booty_call_date[$boy] = daystart + 1:
 			act'"See you tomorrow"':
 				$sex_ev['leave_dialogue'] = 'See you tomorrow'
 				gs'sex_ev_leave', 'leaving_action'
@@ -258,12 +258,12 @@ if $ARGS[0] = 'npc_leaving_dialogue':
 			gs'sex_ev_leave', 'npc_leaving_end'
 		end
 		
-		if npc_sex_ev_date[$boy] = daystart and sex_ev['sleepover'] = 1:
+		if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1:
 			act'"See you soon"':
 				$sex_ev['leave_dialogue'] = '"See you soon."'
 				gs'sex_ev_leave', 'npc_leaving_end'
 			end
-		elseif npc_sex_ev_date[$boy] = daystart + 1:
+		elseif npc_booty_call_date[$boy] = daystart + 1:
 			act'"See you tomorrow"':
 				$sex_ev['leave_dialogue'] = '"See you tomorrow."'
 				gs'sex_ev_leave', 'npc_leaving_end'
@@ -299,7 +299,11 @@ if $ARGS[0] = 'npc_leaving_end':
 		*nl
 		'<<$sex_ev[''leave_action2'']>>'
 	elseif sex_ev['invite_tomorrow'] = 1:
-	
+		'<<$sex_ev[''leave_action1'']>>'
+		*nl
+		'"Want to do this again tomorrow?" you ask.'
+		*nl
+		'<<$sex_ev[''leave_action2'']>>'
 	end
 	act'Leave':gt'sex_ev_leave', 'exit'
 end
@@ -344,12 +348,12 @@ if $ARGS[0] = 'hurry_leave':
 		end
 	end
 	
-	if npc_sex_ev_date[$boy] = daystart and sex_ev['sleepover'] = 1 and $npc_rel_type[$boy] ! 'husband':
+	if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1 and $npc_rel_type[$boy] ! 'husband':
 		act'"See you soon"':
 			$sex_ev['leave_dialogue'] = ', shouting, "See you soon!" just before it slams behind you.'
 			gs'sex_ev_leave', 'hurry_leave2'
 		end
-	elseif npc_sex_ev_date[$boy] = daystart + 1:
+	elseif npc_booty_call_date[$boy] = daystart + 1:
 		act'"See you tomorrow"':
 			$sex_ev['leave_dialogue'] = ', shouting, "See you tomorrow!" just before it slams behind you.'
 			gs'sex_ev_leave', 'hurry_leave2'
@@ -954,8 +958,8 @@ if $ARGS[0] = 'leaving_soon':
 			gs 'sex_ev_leave', 'panty_gift'
 		else
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>.'
-			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-				gs'sex_ev_morning', 'sex_ev_invite_later'
+			if rand(1,3) = 3 and (npc_day_off[$boy] = week and sex_ev['sleepover'] = 1) or ((npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
+				gs 'sex_ev_leave', 'sex_ev_invite_later'
 			else
 				gs 'sex_ev_leave', 'dressing2'
 				gs 'sex_ev_leave', 'panty_gift'
@@ -1097,7 +1101,7 @@ if $ARGS[0] = 'something_to_do':
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "Have a few things I need to get done.'  + iif($sex_ev['loc'] = 'pc_home',' Sorry to kick you out so quickly."',' Thanks for letting me spend the night."')
 			
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-				gs'sex_ev_morning', 'sex_ev_invite_later'
+				gs 'sex_ev_leave', 'sex_ev_invite_later'
 			else
 				iif($sex_ev['loc'] = 'pc_home','"It''s fine. I get it."','"No problem. It was fun."')
 				gs'sex_ev_morning', 'end_morning'
@@ -1121,7 +1125,7 @@ if $ARGS[0] = 'see_a_friend':
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "Need to see a friend later.' + iif($sex_ev['loc'] = 'pc_home','Sorry to kick you out so quickly."','Thanks for letting me spend the night."')
 			
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-				gs'sex_ev_morning', 'sex_ev_invite_later'
+				gs 'sex_ev_leave', 'sex_ev_invite_later'
 			else
 				'"No problem."'
 				gs'sex_ev_morning', 'end_morning'
@@ -1164,7 +1168,7 @@ if $ARGS[0] = 'going_school':
 					'"Gotta get ready for school," you say, <<$sex_ev[''dress_describe'']>>.  "And you gotta get out of here so I can lock up."'
 				end
 				if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-					gs'sex_ev_morning', 'sex_ev_invite_later'
+					gs 'sex_ev_leave', 'sex_ev_invite_later'
 				else
 					'"No problem."'
 					gs'sex_ev_morning', 'end_morning'
@@ -1180,7 +1184,7 @@ if $ARGS[0] = 'going_school':
 					'"Gotta get ready for school," you say, <<$sex_ev[''dress_describe'']>>. "Thanks for letting me spend the night."'
 				end
 				if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-					gs'sex_ev_morning', 'sex_ev_invite_later'
+					gs 'sex_ev_leave', 'sex_ev_invite_later'
 				else
 					'"No problem."'
 					gs'sex_ev_morning', 'end_morning'
@@ -1206,7 +1210,7 @@ if $ARGS[0] = 'school_night':
 				else
 					'"Okay."'
 					if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-						gs'sex_ev_morning', 'sex_ev_invite_later'
+						gs 'sex_ev_leave', 'sex_ev_invite_later'
 					else
 						gs 'sex_ev_leave', 'dressing2'
 					end
@@ -1215,7 +1219,7 @@ if $ARGS[0] = 'school_night':
 			else
 				'"It''s a school night," you say, <<$sex_ev[''dress_describe'']>>. "Gotta get home so I can set my alarm and get up for class tomorrow."'
 				if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
-					gs'sex_ev_morning', 'sex_ev_invite_later'
+					gs 'sex_ev_leave', 'sex_ev_invite_later'
 				else
 					gs 'sex_ev_leave', 'dressing2'
 				end
@@ -1468,6 +1472,7 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
+	!! always call at the top before the text, not after
 	cla & *clr
 	gs'sex_ev_leave', 'dress_loop_code'
 	gs'sex_ev_leave', 'dressing_image'
@@ -1534,6 +1539,13 @@ if $ARGS[0] = 'dress_loop_code':
 				end
 			end
 		end
+	elseif $shoeworntype ! 'none' and sex_ev['dress_end'] ! 1:
+		if $shoeworntype = 'danilovich':
+			$sex_ev['dress_describe'] = 'tying up your shoe laces'
+		else
+			$sex_ev['dress_describe'] = 'slipping on your shoes'
+		end
+		sex_ev['dress_end'] = 1
 	elseif sex_ev['dress_end'] = 1:
 		if CloDress = 1:
 			$sex_ev['dress_describe'] = 'checking your dress'
@@ -2025,6 +2037,8 @@ if $ARGS[0] = 'pc_sex_ev_invite':
 					gs'sex_ev_leave', 'pc_sex_ev_timeset'
 				else
 					'"Twice in one day might be a little bit too much for me," <<$npc_firstname[$boy]>> smiles back ruefully.'
+					gs'sex_ev_leave', 'dress_loop_code'
+					'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 					gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 				end
 			else
@@ -2033,6 +2047,8 @@ if $ARGS[0] = 'pc_sex_ev_invite':
 					gs'sex_ev_leave', 'pc_sex_ev_timeset'
 				else
 					'"Think I might be a little too tapped out from work," <<$npc_firstname[$boy]>> grunts.'
+					gs'sex_ev_leave', 'dress_loop_code'
+					'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 					gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 				end
 			end
@@ -2049,6 +2065,8 @@ if $ARGS[0] = 'pc_sex_ev_invite':
 					gs'sex_ev_leave', 'pc_sex_ev_timeset'
 				else
 					'"Sorry, I have some things I need to get done tomorrow."'
+					gs'sex_ev_leave', 'dress_loop_code'
+					'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 					gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 				end
 			else
@@ -2057,6 +2075,8 @@ if $ARGS[0] = 'pc_sex_ev_invite':
 					gs'sex_ev_leave', 'pc_sex_ev_timeset'
 				else
 					'"Sorry, I have some things I need to get done tomorrow."'
+					gs'sex_ev_leave', 'dress_loop_code'
+					'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 					gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 				end
 			end
@@ -2067,9 +2087,9 @@ end
 if $ARGS[0] = 'pc_sex_ev_timeset':
 	act'How about...': 
 		:invalid_timeset
-		npc_sex_ev_time[$boy] = input ("When do you want to set your reminder? (Pick an hour 1 - 22. A reminder icon will appear in the stat display during that hour.)")
-		if npc_sex_ev_time[$boy] < npc_start_free_time[$boy] or npc_sex_ev_time[$boy] > 22:
-			msg 'Invalid input. Pick an hour between <<npc_start_free_time[$boy]>> and 22.'
+		npc_booty_call_time[$boy] = input ("When do you want to come over to <<$npc_firstname[$boy]>>''s? (Pick an hour 1 - 22.)")
+		if npc_booty_call_time[$boy] > 22:
+			msg 'Invalid input. Pick an hour between 1 and 22.'
 			jump 'invalid_timeset'
 		else
 			gs'sex_ev_leave', 'pc_sex_ev_invite2'
@@ -2081,45 +2101,53 @@ if $ARGS[0] = 'pc_sex_ev_invite2':
 	cla & *clr
 	gs'sex_ev_leave', 'dress_loop'
 	if sex_ev['invite_today'] = 1:
-		if npc_sex_ev_time[$boy] = npc_start_free_time[$boy]:
-			'"How about <<npc_sex_ev_time[$boy]>>?" you smirk <<$sex_ev[''dress_describe'']>>. "We can get off together."'
+		if npc_booty_call_time[$boy] = npc_start_free_time[$boy]:
+			'"How about <<npc_booty_call_time[$boy]>>?" you smirk <<$sex_ev[''dress_describe'']>>. "We can get off together."'
 			gs 'sex_ev_leave', 'pc_sex_ev_invite_accepted'
 		else
-			'"How about <<npc_sex_ev_time[$boy]>>?" you ask <<$sex_ev[''dress_describe'']>>.'
-			if npc_sex_ev_time[$boy] > npc_end_free_time[$boy]:
+			'"How about <<npc_booty_call_time[$boy]>>?" you ask <<$sex_ev[''dress_describe'']>>.'
+			if npc_booty_call_time[$boy] > npc_end_free_time[$boy] or npc_booty_call_time[$boy] < npc_start_free_time[$boy]:
+				gs'sex_ev_leave', 'dress_loop_code'
 				'"Sorry, that doesn''t work for me," <<$npc_firstname[$boy]>> grunts.'
+				gs'sex_ev_leave', 'dress_loop_code'
+				'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 				gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 			else
+				'"That sounds good," <<$npc_firstname[$boy]>> grins back. "Okay, see you then."'
 				gs 'sex_ev_leave', 'pc_sex_ev_invite_accepted'
 			end
 		end
 	else
-		'"How about <<npc_sex_ev_time[$boy]>>?" you ask <<$sex_ev[''dress_describe'']>>.'
-		if npc_sex_ev_time[$boy] > npc_end_free_time[$boy]:
+		'"How about <<npc_booty_call_time[$boy]>>?" you ask <<$sex_ev[''dress_describe'']>>.'
+		if npc_booty_call_time[$boy] > npc_end_free_time[$boy] or npc_booty_call_time[$boy] < npc_start_free_time[$boy]:
+			gs'sex_ev_leave', 'dress_loop_code'
 			'"Sorry, that doesn''t work for me," <<$npc_firstname[$boy]>> grunts.'
+			gs'sex_ev_leave', 'dress_loop_code'
+			'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
 			gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
 		else
+			'"That sounds good," <<$npc_firstname[$boy]>> grins back. "Okay, see you then."'
 			gs 'sex_ev_leave', 'pc_sex_ev_invite_accepted'
 		end
 	end
 end
 
 if $ARGS[0] = 'pc_sex_ev_invite_accepted':
-	'"That sounds good," <<$npc_firstname[$boy]>> grins back. "Okay, see you then."'
 	gs 'booty_call', 'set_booty_call_date'
 	gs 'sex_ev_leave', 'dress_talk'
+	if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 end
 
 if $ARGS[0] = 'pc_sex_ev_invite_denied':
-	gs'sex_ev_leave', 'dress_loop_code'
-	'"Damn," you sigh disappointedly, continuing <<$sex_ev[''dress_describe'']>>'
+
 	gs 'booty_call', 'block_booty_calls'
 	gs 'sex_ev_leave', 'dress_talk'
+	if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 end
 
 if $ARGS[0] = 'npc_sex_ev_invite':
-	cla
 	if (rand(1,10) < npc_sexdrive[$boy] or rand(1,200) < npc_rel[$boy]) and sex_ev['plans_later_talk'] = 0:
+		cla
 		act'Continue':
 			gs 'sex_ev_leave', 'dress_loop'
 			sex_ev['plans_later_talk'] = 1
@@ -2149,7 +2177,7 @@ if $ARGS[0] = 'npc_sex_ev_invite':
 				end
 			end
 			
-			gs 'sex_ev_leave', 'busy_tomorrow'
+			gs 'sex_ev_leave', 'busy_later'
 			
 			act'What time?':
 				gs 'sex_ev_leave', 'dress_loop'
@@ -2164,20 +2192,54 @@ if $ARGS[0] = 'npc_sex_ev_invite':
 	end
 end
 
-if $ARGS[0] = 'busy_tomorrow':
+if $ARGS[0] = 'sex_ev_invite_later':
+	if npc_day_off[$boy] = week and sex_ev['sleepover'] = 1:
+		$sex_ev_plan_loc[$boy] = 'lover_home'
+		sex_ev['invite_today'] = 1
+		if npc_girlfriend[$boy] = 1:
+			pc_know_npc_has_girlfriend[$boy] = 1
+			'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off and my girlfriend won''t be around. Want to come over to my place and do this again?"'
+		else
+			'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''s my day off. Want to come by and do this again?"'
+		end
+	elseif (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1):
+		sex_ev['invite_tomorrow'] = 1
+		if npc_girlfriend[$boy] = 1:
+			pc_know_npc_has_girlfriend[$boy] = 1
+			'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "My girlfriend won''t be around. Want to come over and do this again?"'
+		else
+			'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
+		end
+	end
+	
+	gs 'sex_ev_after', 'dress_loop'
+	
+	gs 'sex_ev_leave', 'busy_later'
+	
+	act'What time?':
+		cla & *nl
+		'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
+		'"<<npc_start_free_time[$boy]>>?" <<$npc_firstname[$boy]>> asks.'
+		gs 'sex_ev_leave', 'busy_time'
+		gs 'sex_ev_leave', 'sex_ev_plan'
+	end
+end
+
+if $ARGS[0] = 'busy_later':
 	act'I''m busy':
 		gs 'booty_call', 'block_booty_calls'
 		gs 'sex_ev_leave', 'dress_loop'
 		if sex_ev['invite_tomorrow'] = 1:
-			'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I''m busy tomorrow."'
+			'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I''ve got a busy schedule tomorrow."'
 		else
-			'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I''m busy."'
+			'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I''m busy today."'
 		end
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
 		gs 'sex_ev_leave', 'dress_talk'
 	end
 end
 
+
 if $ARGS[0] = 'busy_time':
 	act'I''m busy':
 		gs 'booty_call', 'block_booty_calls'
@@ -2185,6 +2247,7 @@ if $ARGS[0] = 'busy_time':
 		'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I have something to do then."'
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
 		gs 'sex_ev_leave', 'dress_talk'
+		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
 end
 
@@ -2195,6 +2258,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		'"Sounds good," you grin, <<$sex_ev[''dress_describe'']>>. "I''ll see you then."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'sex_ev_leave', 'dress_talk'
+		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
 	
 	act'I''ve got nothing better to do':
@@ -2203,6 +2267,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		'"Sure," you smirk, <<$sex_ev[''dress_describe'']>>. "I got nothing better to do."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'sex_ev_leave', 'dress_talk'
+		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
 	
 	act'I could fit it in':
@@ -2215,6 +2280,41 @@ if $ARGS[0] = 'sex_ev_plan':
 			'"Great," <<$npc_firstname[$boy]>> grins back.'
 		end
 		gs 'sex_ev_leave', 'dress_talk'
+		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
+	end
+	
+	act'Another time?':
+		gs 'sex_ev_leave', 'dress_loop'
+		'"That''s no good for me," you shake your head while <<$sex_ev[''dress_describe'']>>. "I have something to do then. What about..."'
+		act'Pick a time':
+			:invalid_timeset2
+			npc_booty_call_time[$boy] = input ("When do you want to come over to <<$npc_firstname[$boy]>>''s? (Pick an hour 1 - 22.)")
+			if npc_booty_call_time[$boy] > 22:
+				msg 'Invalid input. Pick an hour between 1 and 22.'
+				jump 'invalid_timeset2'
+			else
+				gs'sex_ev_leave', 'sex_ev_plan2'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'sex_ev_plan2':
+	cla & *clr
+	gs'sex_ev_leave', 'dressing_image'
+	'"That''s no good for me," you shake your head while <<$sex_ev[''dress_describe'']>>. "I have something to do then. What about <<npc_booty_call_time[$boy]>>? Does that work for you?"'
+	if (sex_ev['invite_tomorrow'] = 1 and (npc_day_off[$boy] = week + 1 or (week = 7 and npc_day_off[$boy] = 1))) or (sex_ev['invite_today'] = 1 and npc_day_off[$boy] = week):
+		'"Sure," he smirks. "It''s my day off. Any time works for me."'
+		'"Great," you say back. "I''ll swing by tomorrow."'
+		gs 'sex_ev_leave', 'pc_sex_ev_invite_accepted'
+	elseif npc_booty_call_time[$boy] > npc_end_free_time[$boy] or npc_booty_call_time[$boy] < npc_start_free_time[$boy]:
+		'"No," <<$npc_firstname[$boy]>> grunts with a shake of his head. "I''ll be busy then too."'
+		'"Damn it all!" you curse. "Why is it so hard just to schedule a time to have sex?!"'
+		gs'sex_ev_leave', 'pc_sex_ev_invite_denied'
+	else
+		'"I think that works for me," <<$npc_firstname[$boy]>> says with a nod of his head.'
+		'"Great," you smile back. "Then I''ll see you at <<npc_booty_call_time[$boy]>>."'
+		gs 'sex_ev_leave', 'pc_sex_ev_invite_accepted'
 	end
 end
 

locations/sex_ev_miss.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'missionary_start':
 			'"I want you on top," you whisper huskily.'
 			act'Keep fucking':gs'sex_ev_miss', 'miss_goto'
 		end
-	elseif sex_ev['initiative'] ! 1 or sex_ev['force_initiative'] = 2:
+	elseif sex_ev['initiative'] ! 1 and sex_ev['force_initiative'] ! 1:
 		gs 'sex_ev_sex', 'speed_select'
 		act'Continue':
 			sex_ev['cock_inserted'] = 1

locations/sex_ev_morning.qsrc

@@ -898,30 +898,18 @@ if $ARGS[0] = 'sex_ev_invite_later':
 		cla & *nl
 		'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
 		'"<<npc_start_free_time[$boy]>>?" <<$npc_firstname[$boy]>> asks.'
-		gs 'sex_ev_after', 'dress_loop'
 		gs 'sex_ev_morning', 'busy_time'
 		gs 'sex_ev_morning', 'sex_ev_plan'
 	end
 end
 
-if $ARGS[0] = 'busy_today':
-	act'I''m busy':
-		gs 'sex_ev', 'block_sex_evs'
-		cla & *nl
-		'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I''m busy."'
-		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
-		gs 'sex_ev_after', 'dress_loop'
-		gs 'sex_ev_morning', 'end_morning'
-	end
-end
 
 if $ARGS[0] = 'busy_time':
 	act'I''m busy':
-		gs 'sex_ev', 'block_sex_evs'
+		gs 'sex_ev', 'block_booty_calls'
 		cla & *nl
 		'"I can''t, sorry," you say, <<$sex_ev[''dress_describe'']>>. "I have something to do then."'
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
-		gs 'sex_ev_after', 'dress_loop'
 		gs 'sex_ev_morning', 'end_morning'
 	end
 end
@@ -932,7 +920,6 @@ if $ARGS[0] = 'sex_ev_plan':
 		cla & *nl
 		'"Sounds good," you grin, <<$sex_ev[''dress_describe'']>>. "I''ll see you then."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
-		gs 'sex_ev_after', 'dress_loop'
 		gs 'sex_ev_morning', 'end_morning'
 	end
 	
@@ -941,7 +928,6 @@ if $ARGS[0] = 'sex_ev_plan':
 		cla & *nl
 		'"Sure," you smirk, <<$sex_ev[''dress_describe'']>>. "I got nothing better to do."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
-		gs 'sex_ev_after', 'dress_loop'
 		gs 'sex_ev_morning', 'end_morning'
 	end
 	
@@ -954,7 +940,6 @@ if $ARGS[0] = 'sex_ev_plan':
 		else
 			'"Great," <<$npc_firstname[$boy]>> grins back.'
 		end
-		gs 'sex_ev_after', 'dress_loop'
 		gs 'sex_ev_morning', 'end_morning'
 	end
 end
@@ -1624,7 +1609,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 end
 
 if $ARGS[0] = 'want_breakfast':
-	if sex_ev['breakfast_finished'] = 0 and $sex_ev['loc'] ! 'hotel_room':
+	if sex_ev['breakfast_finished'] = 0 and $sex_ev['loc'] ! 'hotel_room' and sex_ev['late_for_school'] = 0:
 		act'Breakfast?':
 			cla
 			act'Offer to cook':

locations/sex_ev_pillow_talk.qsrc

@@ -34,7 +34,7 @@ end
 
 if $ARGS[0] = 'topics':
 	gs'sex_ev_pillow_talk', 'stop_talk'
-!!	if sex_ev['angry_after'] = 0:
+	if sex_ev['angry_after'] = 0:
 		act'Small talk':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 		if sex_ev['sex_over'] = 1:
 			act'Talk about the sex':cla & gs'sex_ev_pillow_talk', 'sex_talk'
@@ -49,7 +49,8 @@ if $ARGS[0] = 'topics':
 			act'Morning sex talk':cla & gs'sex_ev_pillow_talk2', 'morning_sex_talk'
 		end
 		gs'sex_ev_talk', 'ma_pill_money'
-!!	end
+	end
+	gs'sex_ev_pillow_talk', 'boy_talk'
 end
 
 if $ARGS[0] = 'talk_time_add':
@@ -1391,7 +1392,7 @@ if $ARGS[0] = 'free_creampies':
 				'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask to come inside me. I really like it when you do. It feels good."'
 				gs 'sex_ev_pillow_talk', 'free_creampies2'
 			end
-			if pc_cum_pref_know[$boy] = 'creampie':
+			if $pc_cum_pref_know[$boy] = 'creampie':
 				act'I know how much you like it':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -1748,22 +1749,19 @@ end
 
 !! ------------------------------ BOY INITIATED CONVERSATIONS -------------------------------------------------
 if $ARGS[0] = 'boy_talk':
-	if sex_ev['boy_topic_check'] = 1: gs 'sex_ev_pillow_talk', 'boy_topic_check'
+	if sex_ev['boy_topic_check'] = 0: gs 'sex_ev_pillow_talk', 'boy_topic_check'
 	
 	if sex_ev['boy_topics'] > 0 and rand(0,1) = 1:
 		:boy_talk_loop
-		if sex_ev['good_for_you'] = 0 and rand(1,3) = 1:
+		if sex_ev['good_for_you'] = 0 and rand(1,2) = 1:
 			gs 'sex_ev_favorite_part', 'boy_good_for_you'
-		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,2) = 1:
-		
-		elseif sex_ev['broken_condom_talk'] = 0 and rand(1,2) = 1:
+		elseif sex_ev['boy_pube_talk'] = 0 and rand(1,1) = 1:
+			gs'sex_ev_pillow_talk', 'boy_pube_talk'
+!!		elseif sex_ev['broken_condom_talk'] = 0 and rand(1,2) = 1:
 		
-		elseif sex_ev['creampie_okay'] = 0:
+!!		elseif sex_ev['creampie_okay'] = 0:
 		
 !!		elseif sex_ev['boy_no_kids'] = 0:
-		
-		else
-			jump 'boy_talk_loop'
 		end
 	end
 end
@@ -1771,8 +1769,8 @@ end
 if $ARGS[0] = 'boy_topic_check':
 	sex_ev['boy_topics'] = 0
 	if sex_ev['cum_count'] >= (npc_sexdrive[$boy] / 4 * 3) and sex_ev['good_for_you'] ! 1: sex_ev['boy_topics'] += 1
-	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1 and (npc_selfish ! 1 and (npc_childfree = 1 or npc_caretaker = 1)): sex_ev['boy_topics'] += 1
-	if sex_ev['creampie_surprise'] >= 1 and sex_ev['creampie_okay'] ! 1: sex_ev['boy_topics'] += 1
+!!	if sex_ev['broken_condom'] >= 1 and sex_ev['broken_condom_talk'] ! 1 and (npc_selfish ! 1 and (npc_childfree = 1 or npc_caretaker = 1)): sex_ev['boy_topics'] += 1
+!!	if sex_ev['creampie_surprise'] >= 1 and sex_ev['creampie_okay'] ! 1: sex_ev['boy_topics'] += 1
 	if sex_ev['boy_pube_talk'] ! 1: sex_ev['boy_topics'] += 1
 !!	if sex_ev['broken_condom'] >= 1 and sex_ev['boy_pube_talk'] ! 1: sex_ev['boy_topics'] += 1
 !!	if sex_ev['condom'] ! 1 and sex_ev['boy_condom_rule_talk'] ! 1: sex_ev['boy_topics'] += 1
@@ -1848,6 +1846,7 @@ end
 
 if $ARGS[0] = 'boy_pube_talk':
 	sex_ev['boy_pube_talk'] = 1
+	sex_ev['boy_topics'] -= 1
 	if ($npc_like_pubestyle[$boy] ! '' and $npc_like_pubestyle[$boy] ! $pube_style['word']) or ($npc_like_pubestyle[$boy] = 'none' and $npc_know_pubes[$boy] ! $pube_style['word']):gt'sex_ev_pillow_talk', 'boy_pubes_changed'
 	
 	$npc_know_pubes[$boy] = $pube_style['word']
@@ -2093,8 +2092,8 @@ if $ARGS[0] = 'boy_pubes_response':
 			'"I think it''s hot," <<$npc_firstname[$boy]>> grins. "I love it when a girl knows how to take care of her bush."'
 			gs'sex_ev_pillow_talk', 'boy_likes_trimmed'
 		elseif npc_bush_pref[$boy] = 3:
-			'"Ever considered letting it grow out? Go full bush?"'
-			gs'sex_ev_pillow_talk', 'boy_likes_bush'
+			'"Ever considered letting it grow out more?"'
+			gs'sex_ev_pillow_talk', 'boy_asks_bush'
 		end
 	elseif pcs_pubes < 4:
 		if npc_bush_pref[$boy] = 1:
@@ -2104,8 +2103,8 @@ if $ARGS[0] = 'boy_pubes_response':
 			'"Ever considered letting it grow out a little?"'
 			gs'sex_ev_pillow_talk', 'boy_asks_trim'
 		elseif npc_bush_pref[$boy] = 3:
-			'"Ever considered letting it grow out? Go full bush?"'
-			gs'sex_ev_pillow_talk', 'boy_likes_bush'
+			'"Ever considered letting it grow out?"'
+			gs'sex_ev_pillow_talk', 'boy_asks_bush'
 		end
 	else
 		'Bug report: boy_pubes_response dead-end'
@@ -2194,6 +2193,46 @@ if $ARGS[0] = 'boy_asks_trim':
 	gs'sex_ev_pillow_talk', 'annoyed_shave'
 end
 
+if $ARGS[0] = 'boy_asks_bush':
+	act'No':
+		cla & *nl
+		if sex_ev['like_pubes'] = 1:
+			'"Not really," you shrug. "I already told you, I like it this way. Why would I consider doing anything different?"'
+		else
+			'"Not really," you say, giving him a look. "What makes you think I''d grow a bush just for you?"'
+		end
+		gs'sex_ev_pillow_talk', 'topic_route'
+	end
+	
+	act'You think I should?':
+		cla & *nl
+		if pcs_pubes < 4:
+			'"You think I should?" you ask him, looking down and inspecting your smooth pussy.'
+		elseif $pube_style['word'] = 'stubble':
+			'"You think I should?" you ask him, looking down and inspecting your stubbly pussy.'
+		else
+			'"You think I should?" you ask him, looking down and inspecting your pubic hair.'
+		end
+		'"Yeah," <<$npc_firstname[$boy]>> says. "I think you''d look super sexy with a full bush."'
+		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
+	end
+	
+	act'You''d like that?':
+		cla & *nl
+		if pcs_pubes < 4:
+			'"You''d like it like that?"" you ask him, looking down and inspecting your smooth pussy.'
+		elseif $pube_style['word'] = 'stubble':
+			'"You''d like it like that?" you ask him, looking down and inspecting your stubbly pussy.'
+		else
+			'"You''d like it like that?" you ask him, looking down and inspecting your pubic hair.'
+		end
+		'"Yeah," <<$npc_firstname[$boy]>> says. "I''d love it if you went full bush."'
+		gs'sex_ev_pillow_talk', 'change_pubes_for_boy'
+	end
+	
+	gs'sex_ev_pillow_talk', 'annoyed_shave'
+end
+
 if $ARGS[0] = 'change_pubes_for_boy':
 	act'I''ll think about it':
 		npc_shave_think[$boy] = daystart

locations/sex_ev_reactions.qsrc

@@ -410,10 +410,10 @@ if $ARGS[0] = 'creampie_ask_next_time':
 						end
 						if sex_ev['cum_wherever'] = 1:
 							'"You told me I could come wherever I wanted," he grins in return.'
-							'"You still need to warn me," you giggle back.'
+							'"You still need to warn me," you chide gently.'
 						elseif npc_know_bc[$boy] = 1:
 							'"You''re on birth control anyways aren''t you?"'
-							'"You still need to ask," you snicker.'
+							'"You still need to ask," you chide gently.'
 						else
 							'"Sorry," <<$npc_firstname[$boy]>> mumbles, apparently exhausted from emptying his balls into you without permission.'
 						end
@@ -444,51 +444,53 @@ if $ARGS[0] = 'creampie_ask_next_time':
 end
 
 if $ARGS[0] = 'creampie_ask_next_time_mad':
-	if npc_ask_creampie[$boy] = 0:
-		act'Ask next time (very mad)':
-			if sex_ev['cock_inserted'] = 0:
-				cla & *nl
-			else
-				cla & *clr
-				if $sex_ev['position'] = 'miss':
-					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
-				elseif $sex_ev['position'] = 'doggy':
-					'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/shock1.jpg"></center>'
-				elseif $sex_ev['position'] = 'cowgirl':
-					'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
+	if sex_ev['creampie_force'] ! 1:
+		if npc_ask_creampie[$boy] = 0:
+			act'Ask next time (very mad)':
+				if sex_ev['cock_inserted'] = 0:
+					cla & *nl
+				else
+					cla & *clr
+					if $sex_ev['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
+					elseif $sex_ev['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/shock1.jpg"></center>'
+					elseif $sex_ev['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/3.jpg"></center>'
+					end
 				end
+				if sex_ev['came_together'] > 0:
+					'"You need to..." you pant. "... ask... before you do... that..."'
+					'It''s hard to give a glare that has impact when you''re still dick drunk off the back of your last orgasm but you somehow manage anyways, looking at him with daggers in your eyes.'
+				else
+					'"Can''t you fucking ask before you come inside me?" you scowl.'
+				end
+				if npc_free_creampies[$boy] = 2:
+					'"I thought you said I didn''t have to ask," <<$npc_firstname[$boy]>> says confusedly.'
+					'"Changed my mind. You need to start asking again."'
+				elseif sex_ev['cum_wherever'] = 1:
+					'"You told me I could come wherever I wanted," he pants in return, smiling.'
+					'"You still need to fucking tell me what you''re gonna do," you hiss.'
+				elseif npc_know_bc[$boy] = 1:
+					'"You''re on birth control anyways aren''t you?"'
+					'"That''s not a fucking excuse you asshole!" you hiss.'
+				else
+					'"Sorry," <<$npc_firstname[$boy]>> mumbles, apparently exhausted from emptying his balls into you without permission.'
+					'"Don''t be sorry," you grumble. "Be better."'
+				end
+				npc_ask_creampie[$boy] = 1
+				gs'sex_ev_reactions', 'creampie_ask_next_time_mad2'
 			end
-			if sex_ev['came_together'] > 0:
-				'"You need to..." you pant. "... ask... before you do... that..."'
-				'It''s hard to give a glare that has impact when you''re still dick drunk off the back of your last orgasm but you somehow manage anyways, looking at him with daggers in your eyes.'
-			else
-				'"Can''t you fucking ask before you come inside me?" you scowl.'
-			end
-			if npc_free_creampies[$boy] = 2:
-				'"I thought you said I didn''t have to ask," <<$npc_firstname[$boy]>> says confusedly.'
-				'"Changed my mind. You need to start asking again."'
-			elseif sex_ev['cum_wherever'] = 1:
-				'"You told me I could come wherever I wanted," he pants in return, smiling.'
-				'"You still need to fucking tell me what you''re gonna do," you hiss.'
-			elseif npc_know_bc[$boy] = 1:
-				'"You''re on birth control anyways aren''t you?"'
-				'"That''s not a fucking excuse you asshole!" you hiss.'
-			else
-				'"Sorry," <<$npc_firstname[$boy]>> mumbles, apparently exhausted from emptying his balls into you without permission.'
-				'"Don''t be sorry," you grumble. "Be better."'
-			end
-			npc_ask_creampie[$boy] = 1
-			gs'sex_ev_reactions', 'creampie_ask_next_time_mad2'
-		end
-	else
-		act'What happened to asking (very mad)':
-			cla & *nl
-			if sex_ev['came_together'] > 0:
-				'"Didn''t..." you pant, exhaustedly glaring at him. "... I tell you... to ask first...?"'
-			else
-				'"What the fuck!" you scowl. "Didn''t I tell you to ask first?!"'
+		else
+			act'What happened to asking (very mad)':
+				cla & *nl
+				if sex_ev['came_together'] > 0:
+					'"Didn''t..." you pant, exhaustedly glaring at him. "... I tell you... to ask first...?"'
+				else
+					'"What the fuck!" you scowl. "Didn''t I tell you to ask first?!"'
+				end
+				gs'sex_ev_reactions', 'creampie_ask_next_time_mad2'
 			end
-			gs'sex_ev_reactions', 'creampie_ask_next_time_mad2'
 		end
 	end
 end
@@ -682,7 +684,7 @@ if $ARGS[0] = 'creampie_gross2':
 		if npc_free_creampies[$boy] > 0 and $pc_cum_pref_know[$boy] = 'creampie':
 			'"They feel weird," you grimace, before twisting your mouth in a wry smirk and shrug. "But I like you. So you better be happy I let you do this."'
 		else
-			'"They feel weird," you grimace. "I don''t like it."'
+			'"It feels weird when guys come inside," you grimace. "It feels like a bunch of slime filling up my vagina. I don''t like it."'
 		end
 		gs'sex_ev_sex', 'sex_end'
 	end
@@ -777,7 +779,11 @@ if $ARGS[0] = 'thanks_for_asking':
 			elseif $sex_ev['position'] = 'cowgirl':
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/smile1.jpg"></center>'
 			end
-			if sex_ev['came_together'] > 0 and npc_ask_creampie[$boy] = 1:
+			if sex_ev['creampie_force'] = 1 and sex_ev['came_together'] > 0:
+				'"Thanks for asking," you pant, smiling mischievously at <<$npc_firstname[$boy]>>.'
+			elseif sex_ev['creampie_force'] = 1:
+				'"Thanks for asking," you say mischievously.'
+			elseif sex_ev['came_together'] > 0 and npc_ask_creampie[$boy] = 1:
 				'"Thanks for asking," you murmur, giving <<$npc_firstname[$boy]>> a blissful smile.'
 				gs'sex_ev_sex', 'sex_end'
 			elseif sex_ev['came_together'] > 0:
@@ -788,12 +794,12 @@ if $ARGS[0] = 'thanks_for_asking':
 				'"Well, you wanted me to, didn''t you?" he smiles back.'
 				gs'sex_ev_sex', 'sex_end'
 			else
-				'"Thanks for asking," you say to <<$npc_firstname[$boy]>>. "It means a lot to me when a guy asks permission to come inside."'
+				'"Thanks for asking," you say to <<$npc_firstname[$boy]>>. "It means a lot to me when you permission to come inside."'
 				if npc_dont_like_creampie[$boy] = 1:
 					'"I thought you didn''t like creampies," he asks curiously.'
 					act'Did it for you':
 						cla & *nl
-						'"I don''t," you say, giving him a warm smile. "But I thought I''d give you a treat."'
+						'"I don''t," you say, giving him a warm smile. "But I know you do."'
 						gs'sex_ev_sex', 'sex_end'
 					end
 					
@@ -1511,7 +1517,7 @@ if $ARGS[0] = 'love_creampies':
 					'"I love it when guys come inside me," you sigh contently. "Something about it just turns me on so much."'
 				end
 				if $npc_cum_pref[$boy] = 'creampie':
-					pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+					 $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
 					'"Coming inside is always the best," he says, looking at you. "We must be made to match."'
 					'"Must be," you say back, giving him a smile.'		
 				else
@@ -1622,6 +1628,11 @@ if $ARGS[0] = 'why_not_inside':
 		act'Why didn''t you come inside me?':
 			cla & *nl
 			'"Aww," you moan. "What a waste. Why didn''t you come inside me?"'
+			if $npc_cum_pref[$boy] = 'creampie':
+				'"It just sorta slipped out," <<$npc_firstname[$boy]>> says a little embarrassedly.'
+			else
+			
+			end
 			gs 'sex_ev_sex', 'sex_end'
 		end
 	end
@@ -2746,11 +2757,11 @@ end
 
 if $ARGS[0] = 'swallow_react1':
 	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
-		if npc_cum_pref[$boy] = 2 and pc_cum_pref_know[$boy] = 0:
+		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = 0:
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			act'You think it''s hot?':
 				cla & *nl
-				pc_cum_pref_know[$boy]= npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy]= npc_cum_pref[$boy]
 				'"Yeah?" you ask, licking your lips. "You think it''s hot?"'
 				'"The hottest thing a girl can do. Even better than coming inside."'
 				act'Good to know':
@@ -2780,7 +2791,7 @@ if $ARGS[0] = 'swallow_react1':
 			end
 			gs 'sex_ev_reactions', 'spit_quit'
 		else
-			if npc_cum_pref[$boy] = 2 and pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
 				'"You''re so hot when you swallow my load like that," <<$npc_firstname[$boy]>> smiles at you.'
 				gs 'sex_ev_reactions', 'swallow_for_you'
 			else
@@ -3086,25 +3097,25 @@ if $ARGS[0] = 'bj_warning_next_time':
 		cla & *clr
 			$sex_ev['bed_room']
 		if sex_ev['bj_cum'] = 1:
-			if pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you say, licking your lips with a smile. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."'
 			end
 		elseif sex_ev['bj_cum'] = 2:
-			if pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 		elseif sex_ev['bj_cum'] = 3:
-			if pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 		end
-		if npc_cum_pref[$boy] = 2 and pc_cum_pref_know[$boy] = 0:
+		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = 0:
 			if npc_generous[$boy] = 1:
 				npc_bj_cum_warn[$boy] = 1
 				'"Sorry," he smiles back apologetically. "I''ll try to remember next time. You''re just so good at this, it''s hard to hold back."'
@@ -3128,7 +3139,7 @@ if $ARGS[0] = 'bj_warning_next_time':
 			end
 
 			act'Really?':
-				pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/smile1.jpg"></center>'
 				'"Really?" you ask. "You like it that much?"'
@@ -3253,7 +3264,7 @@ if $ARGS[0] = 'bj_swallow_gross':
 end
 
 if $ARGS[0] = 'bj_swallow_gross2':
-	if npc_cum_pref[$boy] = 2 and pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
 		act'Because I know you like it':
 			cla & *nl
 			'"Yeah, cause I know you''re a pervert who likes watching me drink your nasty cum," you say with a glare. "I''m generous like that."'
@@ -3310,7 +3321,7 @@ if $ARGS[0] = 'bj_spit_gross':
 end
 
 if $ARGS[0] = 'bj_spit_gross2':
-	if npc_cum_pref[$boy] = 2 and pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
 		act'Compromise':
 			cla & *nl
 			'"Just because I don''t want to swallow doesn''t mean I don''t want you to feel good," you say with a raised eyebrow. "Good sex is all about good compromise, isn''t it?"'

locations/sex_ev_sex.qsrc

@@ -42,6 +42,7 @@ if $ARGS[0] = 'sex_start':
 				
 				act'Change positions':
 					sex_ev['force_initiative'] = 1
+					sex_ev['change_pos'] = 1
 					cla
 					if sex_ev['no_condom'] ! 1:
 						gs 'sex_ev_condoms', 'condoms'
@@ -1278,6 +1279,8 @@ if $ARGS[0] = 'reset':
 	sex_ev['good_for_you'] = 0
 	sex_ev['blowjob_switch'] = 0
 	sex_ev['cock_sex_clean'] = 0
+	if sex_ev['creampie_force'] = 1: sex_ev['creampie_force'] = 2
+	sex_ev['creampie_ask'] = 0
 end
 
 if $ARGS[0] = 'pain':

locations/sex_ev_shower.qsrc

@@ -945,7 +945,7 @@ if $ARGS[0] = 'after_shower_creampie_surprise':
 		*nl
 		'Finally, your orgasms subside and you untangle yourselves. As his cock leaves your pussy, something hot dribbles down your leg.'
 		act'That was nice':
-			cla & *nl
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
 			'"That was nice," you pant, unable to say anything else.'
 			'"I guess... you might need another shower," <<$npc_firstname[$boy]>> says, looking a little embarrassed.'
@@ -1631,7 +1631,7 @@ if $ARGS[0] = 'morning_shower_creampie_surprise':
 		*nl
 		'Finally, your orgasms subside and you untangle yourselves. As his cock leaves your pussy, something hot dribbles down your leg.'
 		act'That was nice':
-			cla & *nl
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
 			'"That was nice," you pant, unable to say anything else.'
 			'"I guess... you might need another shower," <<$npc_firstname[$boy]>> says, looking a little embarrassed.'

locations/sex_ev_talk.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'free_creampies':
 				end
 				gs 'sex_ev_talk', 'free_creampies2'
 			end
-			if pc_cum_pref_know[$boy] = 'creampie':
+			if $pc_cum_pref_know[$boy] = 'creampie':
 				act'I know how much you like it':
 					cla & *clr
 					$sex_ev['temp_pic']

locations/sexshop.qsrc

@@ -335,15 +335,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
 
-	:looperoto_shoes
-		if eroto_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_shoes''"><img src="images/pc/items/eroto/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'looperoto_shoes'
+		i = 1
+
+		:looperoto_shoes
+			if eroto_shoe[i] = 0:
+				gs 'shoe_attributes', 'eroto', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''eroto_shoes''"><img src="images/pc/items/eroto/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'looperoto_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'eroto_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'eroto',i, 2500
@@ -357,14 +378,29 @@ if $ARGS[0] = 'panties':
 	*clr & cla
 	gs'stat'
 
+	gs 'panties', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
 
-	:looperoto_panties
-		if eroto_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/items/eroto/panties/<<i>>.jpg"	height="150" /></a> '
-		i += 1
-	if i <= 43:jump 'looperoto_panties'
+		i = 1
+
+		:looperoto_panties
+			if eroto_panties[i] = 0:
+				gs 'underwear_attributes', 'eroto_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/items/eroto/panties/<<i>>.jpg"	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 43:jump 'looperoto_panties'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'panties2':
@@ -387,14 +423,29 @@ if $ARGS[0] = 'bras':
 	*clr & cla
 	gs'stat'
 
+	gs 'bras', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'sexshop', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
+
+		i = 1
 
-	:looperoto_bras
-		if eroto_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/items/eroto/bras/<<i>>.jpg"	height="150" /></a> '
-		i += 1
-	if i <= 27:jump 'looperoto_bras'
+		:looperoto_bras
+			if eroto_bras[i] = 0:
+				gs 'underwear_attributes', 'eroto_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/items/eroto/bras/<<i>>.jpg"	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 27:jump 'looperoto_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bras2':

locations/shoes.qsrc

@@ -17,7 +17,7 @@ $shoe_list_line = {
 	else
 		shoe_temp = 75 & !shoe widdefault to 75
 	end
-	$RESULT +='<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$shoe_image'', $ARGS[1], ARGS[2])>>" width="<<shoe_temp>>"></a></TD>'
+	$RESULT +='<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''<<$ARGS[1]>>'', <<ARGS[2]>>"><img src="<<FUNC(''$shoe_image'', $ARGS[1], ARGS[2])>>" width="<<shoe_temp>>"></a></TD>'
 	killvar 'shoe_temp'
 	gs 'shoe_attributes', $ARGS[1], ARGS[2]
 
@@ -36,7 +36,7 @@ $shoe_list_line = {
 		$RESULT += '<TD>No</TD>'
 	end
 	
-	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
+	$RESULT += '<TD><a href="exec:gt ''shoes'', ''view_shoe_item'', ''wardrobe'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">View</a></TD>'
 
 	$RESULT += '<TD>'
 	if sloc ! 1:$RESULT += ' <a href="exec:gt ''shoes'', ''dest1'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>>">Storage</a>'
@@ -95,60 +95,143 @@ if $ARGS[0] = 'view_shoe_list':
 	if $ARGS[1] = 'unwanted':
 		sloc = 2
 	end
+	gs 'shoes', 'filter_header', 'store'
 
 	$bgcolor='#f3f4ee'
 
 	'<center><table border=0 cellspacing=0 cellpadding=5><TH></TH><TH>Shoe</TH><TH>Description</TH><TH>Bimbo</TH><TH>Stripper</TH><TH>Actions</TH>'
 
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
 	i = 1
 	:loopmoncheri_shoe
-		if moncheri_shoe[i] = 1 and moncheri_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'moncheri', i)
-		i += 1
+		if moncheri_shoe_s[i] = sloc and moncheri_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'moncheri', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'moncheri', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('moncheri_shoe'):jump 'loopmoncheri_shoe'
 
 	i = 1
 	:loopcats_shoe
-		if cats_shoe[i] = 1 and cats_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'cats', i)
-		i += 1
+		if cats_shoe_s[i] = sloc and cats_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'cats', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'cats', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('cats_shoe'):jump 'loopcats_shoe'
 
 	i = 1
 	:loopbomba_shoe
-		if bomba_shoe[i] = 1 and bomba_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'bomba', i)
-		i += 1
+		if bomba_shoe_s[i] = sloc and bomba_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'bomba', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'bomba', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('bomba_shoe'):jump 'loopbomba_shoe'
 
 	i = 1
 	:loopdolls_shoe
-		if dolls_shoe[i] = 1 and dolls_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
-		i += 1
+		if dolls_shoe_s[i] = sloc and dolls_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'dolls', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('dolls_shoe'):jump 'loopdolls_shoe'
 
 	i = 1
 	:loopgm_shoe
-		if gm_shoe[i] = 1 and gm_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'gm', i)
-		i += 1
+		if gm_shoe_s[i] = sloc and gm_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'gm', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'gm', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('gm_shoe'):jump 'loopgm_shoe'
 
 	i = 1
 	:looperoto_shoe
-		if eroto_shoe[i] = 1 and eroto_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'eroto', i)
-		i += 1
+		if eroto_shoe_s[i] = sloc and eroto_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'eroto', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'eroto', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('eroto_shoe'):jump 'looperoto_shoe'
 
 	i = 1
 	:loopscandalicious_shoe
-		if scandalicious_shoe[i] = 1 and scandalicious_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'scandalicious', i)
-		i += 1
+		if scandalicious_shoe_s[i] = sloc and scandalicious_shoe[i] = 1 and Shofilter['sport_only'] = 0:
+			gs 'shoe_attributes', 'scandalicious', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'scandalicious', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('scandalicious_shoe'):jump 'loopscandalicious_shoe'
 
 	i = 1
 	:loopdanilovich_shoe
-		if danilovich_shoe[i] = 1 and danilovich_shoe_s[i] = sloc:*P dyneval($shoe_list_line, $ARGS[1], 'danilovich', i)
-		i += 1
+		if danilovich_shoe_s[i] = sloc and danilovich_shoe[i] = 1 and Shofilter['sport'] = 0:
+			gs 'shoe_attributes', 'danilovich', i
+			gs 'shoes', 'shoe_filter'
+			!!sort by filter
+			if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+				if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+					*P dyneval($shoe_list_line, $ARGS[1], 'danilovich', i)
+				end
+			end
+		end
+	i += 1
 	if i <= ARRSIZE('danilovich_shoe'):jump 'loopdanilovich_shoe'
 
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
+
 	'</table></center>' 
+
 end
 
 if $ARGS[0] = 'moncheri':
@@ -345,4 +428,237 @@ if $ARGS[0] = 'wear':
 	end
 end
 
+if $ARGS[0] = 'filter_header':
+!! exclude filters
+	$Headerstring = '<TD>'
+	if Shofilter['sport'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''sport''] = 1 & Shofilter[''sport_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''sport''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['stripper'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 1 & Shofilter[''stripper_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['bimbo'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 1 & Shofilter[''bimbo_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['alternative'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 1 & Shofilter[''alternative_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	end
+
+!! sort by filters
+	$Headerstring += '<TD>'
+	if Shofilter['number'] = 0:
+		Shofilter['quality'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''number''] = 0 & Shofilter[''quality''] = 1 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if Shofilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Clo_i = 0 & Shofilter[''quality''] = 0 & Shofilter[''number''] = 1 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if Shofilter['sport_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''sport_only''] = 1 & Shofilter[''sport''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''sport_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['stripper_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 1 & Shofilter[''stripper''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['bimbo_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 1 & Shofilter[''bimbo''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['alternative_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 1 & Shofilter[''alternative''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 0 & gt ''shoes'', ''view_shoe_list''"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = '<TH>Include</TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'shoe_filter':
+!!Exclude filters
+	Shofilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['stripper'] = 1 and ShoStyle = 1:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['bimbo'] = 1 and ShoStyle = 2:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['alternative'] = 1 and ShoStyle = 3:
+		Shofilter['inc'] = 0
+	end
+
+!!only filters
+	Shofilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if Shofilter['stripper_only'] = 1 and ShoStyle = 1:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['bimbo_only'] = 1 and ShoStyle = 2:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['alternative_only'] = 1 and ShoStyle = 3:
+		Shofilter['only'] += 1
+	end
+	!!Check total count to make sure it fits all groups selected
+	if Shofilter['only'] = Shofilter['stripper_only'] + Shofilter['bimbo_only'] + Shofilter['alternative_only']:
+		Shofilter['only'] = 1
+	else
+		Shofilter['only'] = 0
+	end
+end
+
+if $ARGS[0] = 'shop_filter_header':
+!! exclude filters
+	$Headerstring = '<TD>'
+	if Shofilter['stripper'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 1 & Shofilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['bimbo'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 1 & Shofilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	end
+
+	$Headerstring += '<TD>'
+	if Shofilter['alternative'] = 0:
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 1 & Shofilter[''alternative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''alternative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	end
+
+!! sort by filters
+	$Headerstring += '<TD>'
+	if Shofilter['number'] = 0:
+		Shofilter['quality'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''number''] = 0 & Shofilter[''quality''] = 1 & Shofilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if Shofilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:Shofilter[''quality''] = 0 & Shofilter[''number''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if Shofilter['stripper_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 1 & Shofilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['bimbo_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 1 & Shofilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	end
+
+	$Headerstring[1] += '<TD>'
+	if Shofilter['alternative_only'] = 0:
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 1 & Shofilter[''alternative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:Shofilter[''alternative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/alternative.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = '<TH>Include</TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'shop_filter':
+!!Exclude filters
+	Shofilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['stripper'] = 1 and ShoStyle = 1:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['bimbo'] = 1 and ShoStyle = 2:
+		Shofilter['inc'] = 0
+	end
+	!!filters, if inc set to 0 they will not display
+	if Shofilter['alternative'] = 1 and ShoStyle = 3:
+		Shofilter['inc'] = 0
+	end
+
+!!only filters
+	Shofilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if Shofilter['stripper_only'] = 1 and ShoStyle = 1:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['bimbo_only'] = 1 and ShoStyle = 2:
+		Shofilter['only'] += 1
+	end
+	if Shofilter['alternative_only'] = 1 and ShoStyle = 3:
+		Shofilter['only'] += 1
+	end
+	!!Check total count to make sure it fits all groups selected
+	if Shofilter['only'] = Shofilter['stripper_only'] + Shofilter['bimbo_only'] + Shofilter['alternative_only']:
+		Shofilter['only'] = 1
+	else
+		Shofilter['only'] = 0
+	end
+end
+
+
 --- shoes ---------------------------------

locations/shop_coco_carmen.qsrc

@@ -146,29 +146,6 @@ if $ARGS[0] = 'coco_outfits':
 
 end
 
-if $ARGS[0] = 'shoes':
-	$loc_arg = $ARGS[0]
-	$loc = 'shop_coco_carmen'
-	$menu_loc = 'shop_coco_carmen'
-	$menu_arg = 'shoes'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-
-	act 'Return': minut += 1 & gt 'shop_coco_carmen', 'start'
-
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopcoco_shoes
-		if scoco[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_coco_carmen'', ''coco_shoes''"><img src="images/pc/shoes/coco/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 37:jump 'loopcoco_shoes'
-end
-
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'
 	$loc = 'shop_coco_carmen'

locations/shop_dolls.qsrc

@@ -205,18 +205,40 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
 		minut += 5
 		gt 'shop_dolls', 'browse'
 	end
-	i = 1
 
-	:loopdolls_shoes
-		if dolls_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/dolls/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 120:jump 'loopdolls_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopdolls_shoes
+			if dolls_shoe[i] = 0:
+				gs 'shoe_attributes', 'dolls', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_dolls'', ''dolls_shoes''"><img src="images/pc/items/dolls/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 120:jump 'loopdolls_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'dolls_shoes':

locations/shop_photography.qsrc

@@ -29,13 +29,12 @@ if $ARGS[0] = 'start':
 			minut += 10
 			gs 'stat'
 			'<center><img src="images/locations/city/citycenter/mall/photoshop/owner.jpg"></center>'
-			if photography_start = 1:
-				dynamic $photojob[evt_PhotoID]
+			if photography_start = 1:	
 				'You walk up to Branko. "Excuse me Branko, but you said you might have some work for me. Would you happen to have anything?"'
 				'He smiles at you. "Yes yes, I remember. You''re <<$pcs_nickname>>,  Let me check." He opens a laptop sitting on the counter next to him and taps on the keys before he looks up at you.'
 				
 				!! Init Job Array
-				gs 'shop_photography', 'job_init'
+				gs 'photography_work', 'job_init'
 				gs 'emp_functions', 'disp_evt', 1
 				
 			end
@@ -68,6 +67,10 @@ if $ARGS[0] = 'start':
 			act 'Walk away': gt 'shop_photography' , 'start'
 		end
 	end
+	if evt_chk = 1:
+		!! We've got an event today, check it's location:
+		gs 'emp_functions', 'disp_evt', 3
+	end
 	act 'Leave':
 		*clr & cla
 		minut += 3
@@ -172,229 +175,7 @@ if $ARGS[0] = 'showportfolio':
 	act 'Walk away': gt 'shop_photography' , 'start'
 end
 
-if $ARGS[0] = 'work':
-	*clr & cla
-	minut += 10
-	gs 'stat'
-	'<center><img src="images/locations/city/citycenter/mall/photoshop/owner.jpg"></center>'
-	'You can''t help but smile and feel excited. Yet another paying job as a photographer! "Yes I would love to, just tell me what you have."'
-	'He smiles. "Excellent! I need photos of <<$transient_desc>>" He prints out a page and hands it to you. "Okay, here''s where it is and a list of the photos I need. When you finish, come back here to give me the photos and get paid."'
-	'You smile at him. "Thank you, I''ll go there now." With that, you leave the store.'
-	act 'Go to work': gt 'shop_photography' , 'photojob'
-end
-
-if $ARGS[0] = 'photojob':
-	*clr & cla
-	gs 'exp_gain', 'photoskl', rand(1,50)
-	gs 'stat'
-	photography_job += 1
-	photojob_daystart = daystart
-	! Prevent taking a new job on the sunday following today
-	if week = 6: photojob_daystart += 1
-	minut += rand(1,2)
-	gs 'stat'
-	$loc =$transient_mc_locat
-	$loc_arg = $photojob_loc_arg
-	gt 'shop_photography', $transient_trigger
-end
-
-if $ARGS[0] = 'photojob_pay':
-	if pcs_photoskl > 125:
-		gs 'emp_functions', 'wage_evt', 4
-	elseif pcs_photoskl > 100:
-		gs 'emp_functions', 'wage_evt', 3
-	elseif pcs_photoskl > 75:
-		gs 'emp_functions', 'wage_evt', 2
-	elseif pcs_photoskl > 50:
-		gs 'emp_functions', 'wage_evt', 1
-	else
-		gs 'emp_functions', 'wage_evt', 5, 100
-	end
-end
-
-!! Photography jobs functions
-
-if $ARGS[0] = 'job_init':
-	!! Set up arrays if not initialised
-	if $evt_job[1] = '' :  gs 'emp_functions', 'job_evt'
-	array_len = ARRSIZE('$photojob')
-	array_len = array_len -1	
-	evt_PhotoID = rand(1, array_len)
-	dynamic $photojob[evt_PhotoID]
-	!! set Day of Week for job to appear on	
-	transient_evt_dow = 6
-    !! Now set up the event date
-    gs 'shop_photography' , 'photojob_pay'
-    gs 'emp_functions', 'gen_evt'
-end
-
-
-! Array of photography jobs - additional events should be easy to wire up
-$photojob[1] = {
-	!!Ensure the event is visible in journal:
-	transient_evt_silent = 1
-	!! Set the job type as per list
-	transient_evt_type = 1
-	transient_evt_sub_type = 1
-	$photojob_shortname = 'Tank'
-	$transient_desc = 'Tank and Bazooka Experience Day in Levingrad Oblast'
-	!! Field for trigger location
-	$transient_loc = 'city_industrial'
-	$transient_arg = ''
-	!! Journal loc description
-	$transient_mc_locat = 'St Petersburg Industrial Area'
-	!! Event content location
-	$transient_evt_exec=  'shop_photography'
-	$transient_trigger = 'phototank'
-}
-
-$photojob[2] = {
-	transient_evt_silent = 1
-	transient_evt_type = 1
-	transient_evt_sub_type = 2
-	$photojob_shortname = 'Model'
-	$transient_desc = 'Newspaper Commission at Petrovskaya Akvatoria'
-	$transient_loc = 'shop_photography'
-	$transient_arg = 'start'
-	$transient_mc_locat = 'Meet Branko at the Photography Shop'
-	$transient_trigger = 'photomodel'
-}
-
-$photojob[3] = {
-	transient_evt_silent = 1
-	transient_evt_type = 1
-	transient_evt_sub_type = 3
-	$photojob_shortname = 'Wedding'
-	$transient_desc = 'Wedding at Yelagin Palace'
-	$transient_loc = 'city_residential'
-	$transient_arg = ''
-	$transient_mc_locat = 'St Petersburg Residential Area'
-	$transient_trigger = 'photowedding'
-}
-
-$photojob[4] = {
-	transient_evt_silent = 1
-	transient_evt_type = 1
-	transient_evt_sub_type = 4
-	$photojob_shortname = 'Motorsport'
-	$transient_desc = 'Russian Touring Car Championship Event at St. Petersburg Autodrome'
-	$transient_loc = 'city_industrial'
-	$transient_arg = ''
-	$transient_mc_locat = 'St Petersburg Industrial Area'
-	$transient_trigger = 'photomotorsport'
-}
-
-$photojob[5] = {
-	transient_evt_silent = 1
-	transient_evt_type = 1
-	transient_evt_sub_type = 5
-	$photojob_shortname = 'Court'
-	$transient_desc = 'Press Event at City Courthouse'
-	$transient_loc = 'shop_photography'
-	$transient_arg = 'start'
-	$transient_mc_locat = 'Meet Branko at the Photography Shop'
-	$transient_trigger = 'photocourt'
-}
-
-if $ARGS[0] = 'phototank':
-	*clr & cla
-	minut += 20
-	gs 'stat'
-	'<center><img src="images/characters/shared/headshots_generic/37.jpg"></center>'
-	'You head over to the industrial region where you quickly meet up with your contact at the Experience Center.'
-	'"Hi there; you must be <<$pcs_firstname>>. The group is already on their way to the site, so I''ll take you up there in my car. I''m sure you know everything you need to do, but feel free to ask if you have any questions."'
-	'You get in the car and drive for nearly half an hour until you reach the Experience Center. Once there, the representative parks the car and you get out and head inside.'
-	act 'Go to the Experience Center':
-		*clr & cla
-		minut += rand(120,150)
-		gs 'exp_gain', 'photoskl', rand(6,10)
-		gs 'stat'
-		gs 'shop_photography', 'photojob_pay'
-		'<center><img src="images/pc/activities/photography/job/tank.jpg"></center>'
-		'You arrive at the Experience Center and spend the next two hours taking as many pictures of the experience as you can. The group is clearly enjoying the event; They get to ride in military vehicles across rough terrain and fire weapons at the shooting range.'
-		'Once the day is over, you remove your SD card and hand it to the representative, who shows the photos to the group. Once they''ve sorted out whether any of the customers want additional copies, your contact takes you back to the city''s industrial region. When you check your account, you see that you have been paid <<photopay>>.'
-		gs 'shop_photography', 'photojob_cleanup'
-		act 'Return': gt $loc, $loc_arg
-	end
-end
-
-if $ARGS[0] = 'photomodel':
-	*clr & cla
-	minut += rand(60,90)
-	gs 'exp_gain', 'photoskl', rand(3,5)
-	gs 'stat'
-	gs 'shop_photography', 'photojob_pay'
-	'<center><img src="images/pc/activities/photography/job/model<<rand(1,3)>>.jpg"></center>'
-	'You go to the Petrovskaya Akvatoria Model Museum to take pictures of the various exhibits on behalf of an international newspaper.'
-	'After a brief introduction to a member of staff to confirm your activities, you walk around the exhibit, taking a large number of photographs so that the article has a wealth to choose from.'
-	'Once you''re finished, you return to the shop and hand the SD card to Branko, who gives you your fee of <<photopay>>₽.'
-	gs 'shop_photography', 'photojob_cleanup'
-	act 'Return' : gt $loc, $loc_arg
-end
-
-if $ARGS[0] = 'photowedding':
-	*clr & cla
-	minut += rand(10,18)
-	gs 'stat'
-	'<center><img src="images/characters/shared/headshots_generic/18.jpg"></center>'
-	'You head over to the residential district where you meet one of the family members of the betrothed.'
-	'"Hello, you must be the photographer! If you follow me, I''ll take you to the happy couple to take the pictures of them."'
-	act 'Follow':
-		*clr & cla
-		minut += rand(90,120)
-		gs 'exp_gain', 'photoskl', rand(6,10)
-		gs 'stat'
-		gs 'shop_photography', 'photojob_pay'
-		'<center><img src="images/pc/activities/photography/job/wedding.jpg"></center>'
-		'You meet the bride and groom and help direct them into a number of framed situations for you to take some beautiful photos of them together.'
-		'Once you have enough, you spend the rest of the day in the background taking a number of photos of the wedding. Once it''s over, you meet back up with the relative who takes the SD card from you.'
-		'Leaving them to close up the venue, you walk out back into the residential district. When you check your account, you see that you have been paid <<photopay>>.'
-		gs 'shop_photography', 'photojob_cleanup'
-		act 'Return' : gt $loc, $loc_arg
-	end
-end
-
-if $ARGS[0] = 'photomotorsport':
-	*clr & cla
-	minut += rand(15,20)
-	gs 'stat'
-	'<center><img src="images/characters/shared/headshots_generic/11.jpg"></center>'
-	'You head over to the industrial region and meet a representative of the Autodrome. You will be expected to take pictures of the event and deliver them to your contact.'
-	'"Why hello there, you must be the person Branko sent. I''m sure you already know everything you have to do at the track, so I''ll give you this press pass and take you to the Autodrome."'
-	'You look at the pass they gave you before getting in their car to be taken to the track.'
-	act 'Go to the Autodrome':
-		*clr & cla
-		minut += rand(180,240)
-		gs 'exp_gain', 'photoskl', rand(9,15)
-		gs 'stat'
-		gs 'shop_photography', 'photojob_pay'
-		'<center><img src="images/pc/activities/photography/job/motorsport.jpg"></center>'
-		'You''re dropped off at the employee entrance and directed to the pit area as the teams get their vehicles prepared.'
-		'You start off by getting shots of the teams in the build-up to the race, showcasing the tension and focus as the countdown approaches zero.'
-		'When the race itself starts you roam the track, taking pictures of any event as it happens, getting high intensity shots of fast paced action, as well as the smooth professionalism of the leading drivers. It is a fantastic experience.'
-		*nl
-		'With your job done, you find your contact again and hand them a full SD card for which they are gratified.'
-		'Your contact then takes you back to the city''s industrial region. When you check your account, you see that you have been paid <<photopay>>.'
-		gs 'shop_photography', 'photojob_cleanup'
-		act 'Return' : gt $loc, $loc_arg
-	end
-end
 
-if $ARGS[0] = 'photocourt':
-	*clr & cla
-	minut += 60
-	gs 'exp_gain', 'photoskl', rand(3,5)
-	gs 'stat'
-	gs 'shop_photography', 'photojob_pay'
-	'<center><img src="images/pc/activities/photography/job/court.jpg"></center>'
-	'"You need to go to the courthouse to take publicity photographs of the completed court session as they leave the building, then deliver them back to me to give you your commission."'
-	'You head into the City Center and straight to the courthouse, which has already seen a number of people turn up.'
-	'Once you''ve ingratiated yourself into the crowd, you position yourself to take some good shots of the plaintiff accompanied by their lawyers and representatives.'
-	'With the verdict read, you quickly make your way outside to the front of the courthouse to take photos of him leaving.'
-	'Once you''re finished, you return to the shop and hand the SD card to Branko, who gives you your fee of <<photopay>>₽.'
-	gs 'shop_photography', 'photojob_cleanup'
-	act 'Return' : gt $loc, $loc_arg
-end
 
 --- shop_photography ---------------------------------
 

locations/shop_pussycats.qsrc

@@ -1099,8 +1099,6 @@ if $ARGS[0] = 'clothes':
 	clo_i = 0
 	:loopcats_outfits_filter
 
-		i = Clothingstock + 1
-
 		if Clothingstock > 15:
 			i = 1
 		elseif Clothingstock > 7:
@@ -1140,6 +1138,10 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -1147,11 +1149,28 @@ if $ARGS[0] = 'shoes':
 		gt 'shop_pussycats', 'start'
 	end
 
-	i = 1
-	:loopcats_shoe
-		if cats_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''cats_shoe''"><img src="images/pc/items/cats/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopcats_shoe'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopcats_shoe
+			if cats_shoe[i] = 0:
+				gs 'shoe_attributes', 'cats', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''cats_shoe''"><img src="images/pc/items/cats/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopcats_shoe'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'cats_shoe': gt 'shoes', 'view_shoe_item', 'shop', 'cats',i, 900
@@ -1162,18 +1181,33 @@ if $ARGS[0] = 'panties':
 	cls
 	gs'stat'
 
+	gs 'panties', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'shop_pussycats', 'start'
 	end
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
 
-	:loopcats_panties
-		if cats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/items/cats/panties/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 72:jump 'loopcats_panties'
+		i = 1
+
+		:loopcats_panties
+			if cats_panties[i] = 0:
+				gs 'underwear_attributes', 'cats_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/items/cats/panties/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 72:jump 'loopcats_panties'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'panties2':
@@ -1194,18 +1228,33 @@ if $ARGS[0] = 'bras':
 	cls
 	gs'stat'
 
+	gs 'bras', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'shop_pussycats', 'start'
 	end
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
 
-	:loopcats_bras
-		if cats_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''bras2''"><img src="images/pc/items/cats/bras/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 41:jump 'loopcats_bras'
+		i = 1
+
+		:loopcats_bras
+			if cats_bras[i] = 0:
+				gs 'underwear_attributes', 'cats_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''bras2''"><img src="images/pc/items/cats/bras/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 41:jump 'loopcats_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bras2':

locations/shop_scandalicious.qsrc

@@ -181,6 +181,10 @@ if $ARGS[0] = 'shoes':
 	$loc = 'shop_scandalicious'
 	cls
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -188,11 +192,28 @@ if $ARGS[0] = 'shoes':
 		gt 'shop_scandalicious', 'start'
 	end
 
-	i = 1
-	:loopscandalicious_shoes
-		if scandalicious_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''shoes2''"><img src="images/pc/items/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 80:jump 'loopscandalicious_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopscandalicious_shoes
+			if scandalicious_shoe[i] = 0:
+				gs 'shoe_attributes', 'scandalicious', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''shoes2''"><img src="images/pc/items/scandalicious/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 80:jump 'loopscandalicious_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'shoes2': gt 'shoes', 'view_shoe_item', 'shop', 'scandalicious',i, 1500
@@ -296,14 +317,33 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
+	gs 'underwear_bodysuits', 'shop_filter_header'
+
 	act 'Return': minut += 1 & gt 'shop_scandalicious', 'start'
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbodysuitquality_filter
+
+		if Clothingstock > 11:
+			i = 1
+		else
+			i = 2
+		end
 
-	:loopscandalicious_bodysuit
-		if scandalicious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		:loopscandalicious_bodysuit
+			if scandalicious_bodysuits[i] = 0:
+				gs 'underwear_attributes', 'scandalicious_bodysuits', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+				end
+			end
 		i += 1
-	if i <= 100:jump 'loopscandalicious_bodysuit'
+		if i <= 100:jump 'loopscandalicious_bodysuit'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbodysuitquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bodysuit2':

locations/shop_tsar_bomba.qsrc

@@ -174,14 +174,36 @@ if $ARGS[0] = 'shoes':
 	menu_off = 0
 	*clr & cla
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return': minut += 5 & gt 'shop_tsar_bomba', 'start'
-	i = 1
 
-	:loopbomba_shoes
-		if bomba_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/bomba/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopbomba_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+
+		:loopbomba_shoes
+			if bomba_shoe[i] = 0:
+				gs 'shoe_attributes', 'bomba', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''shop_tsar_bomba'', ''bomba_shoes''"><img src="images/pc/items/bomba/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopbomba_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'bomba_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'bomba',i, 2000

locations/sitr.qsrc

@@ -21,34 +21,34 @@ if remsitr = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr1.jpg"></center>'
 	end
 
-	$zal = 'A cramped room'
+	$zal = 'A poorly decorated and cramped room'
 	$zal2 = 'faded wall'
 elseif remsitr = 1:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
 	$zal = 'A modern, bright room'
-	$zal2 = 'papered walls with light'
+	$zal2 = 'papered walls'
 end
-if TV = 0:$TV = 'a great place for a TV, if you had one.'
-if TV = 1:$TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">TV</a>'
-if TV = 2:$TV = 'a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>'
+if TV = 0: $TV = 'a great place for a TV, if you had one.'
+if TV = 1: $TV = 'an old CRT <a href="exec:gt ''TV'', ''start''">television</a>'
+if TV = 2: $TV = 'a huge plasma <a href="exec:gt ''TV'', ''start''">TV</a>'
 ! WD: Missing Code to buy / Upgrade Sofa, Uninitialised ~ 'divan'
-if divan = 0:$divan = '<a href="exec:gt ''divan'', ''start''">an old sofa</a>'
-if divan = 1:$divan = '<a href="exec:gt ''divan'', ''start''">a luxurious leather sofa</a>'
+if divan = 0:$divan = '<a href="exec:gt ''divan'', ''start''">An old sofa</a>'
+if divan = 1:$divan = '<a href="exec:gt ''divan'', ''start''">A luxurious leather sofa</a>'
 if komp = 0:$komp = ''
 if komp = 1:
 	!!TODO: Code to check if Sveta is not alone or something limits what she can do.
 	gs 'internet_mobile', 'get_access'
-	$komp = ' with a <a href="exec:gt ''Komp'', ''start''">computer</a> on top of it'
+	$komp = 'A <a href="exec:gt ''Komp'', ''start''">computer</a> sits on top of it.'
 end
+! WD: Missing Code to buy / upgrade table, Uninitialised ~ 'stol'
+if stol = 0: $stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
+if stol = 1: $stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
 
-! WD: Missing Code to buy / Upgrade table, Uninitialised ~ 'stol'
-if stol = 0:$stol = 'an old wooden <a href="exec:gt ''stol'', ''start''">table</a>'
-if stol = 1:$stol = 'a new <a href="exec:gt ''stol'', ''start''">table</a>'
-if obruch > 0: '<br>Your hula hoop stands in a corner of the room. '
+'<<$zal>>. <<$divan>> sits next to the <<$zal2>>. In front of the sofa is <<$TV>>, while <<$stol>> sits in front of the window. <<$komp>>'
+if mishka > 0: iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + 'sitting on a shelf.'
+if obruch > 0: '<br>Your hula hoop stands in a corner of the room.'
 if skak > 0: 'Your jump rope is on a shelf. '
-if bookYog > 0: 'Your yoga mat is rolled up in a corner. '
-'<<$zal>>, <<$divan>> stands next to the <<$zal2>>. In front of the sofa is <<$TV>>. In front of the window is <<$stol>><<$komp>>.'
-if mishka > 0: iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + ' on a shelf.'
+if bookYog > 0: 'Your yoga mat is rolled up in a corner.'
 
 *nl
 !gs'husb' - do not delete!
@@ -60,11 +60,11 @@ gs 'exercise', 'start'
 
 *nl
 !!housegostrand = rand(1, 20)
-!!if husband > 0 and husbandrink ! 10 and week = 5 and hour > 17 and hour < 21 and housegostrand > 15:gt 'sitr', 'guest'
+!!if husband > 0 and husbandrink ! 10 and week = 5 and hour > 17 and hour < 21 and housegostrand > 15: gt 'sitr', 'guest'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
-		'<a href="exec:gt ''husb'', ''start''">Your husband sits on the couch and watches television.</a>'
+		'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sitting on the couch, watching television.'
 		gs 'music_actions', 'not_alone'
 	else
 		gs 'music_actions', 'clear_restrictions'
@@ -88,32 +88,31 @@ if dildo > 0 and pcs_horny >= 50:
 				gt 'husbsex','husb_mastr_vtor'
 			else
 				'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time attaching the suction base of the dildo onto the floor before lowering yourself slowly to its tip.'
-				'Shivers run down your spine as you feel that thick head spreading your pussy-lips, and soon, the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when that delicious cock finally bottoms out in your cunt, sending you to the heavens and back.'
-				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts- soon hammering your ass against the cold floor time and time again. It takes you just a few minutes to reach that so wanted orgasm, your toes curling tightly as that wonderful feeling run through your entire body...'
-				'Soon you''re twitching onto that dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths, and a smile grows along your face after cumming so hard there. That was just what you needed!'
-
+				'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+				'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+				'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+				'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
 				
-				act 'Breathe':gt 'sitr'
+				act 'Breathe': gt 'sitr'
 			end
 		else
 			'<center><video autoplay loop src="images/shared/sex/mast/mastr.mp4"></video></center>'
-			'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time attaching the suction base of the dildo onto the floor before lowering yourself slowly to its tip.'
-			'Shivers run down your spine as you feel that thick head spreading your pussy-lips, and soon, the whole length begins to slide deep inside your hole. A throaty moan overwhelms the room when that delicious cock finally bottoms out in your cunt, sending you to the heavens and back.'
-			'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts- soon hammering your ass against the cold floor time and time again. It takes you just a few minutes to reach that so wanted orgasm, your toes curling tightly as that wonderful feeling run through your entire body...'
-			'Soon you''re twitching onto that dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths, and a smile grows along your face after cumming so hard there. That was just what you needed!'
-
+			'Unable to control yourself anymore, you immediately reach for your dildo so you can finally take care of your lustful desires. You waste no time and attach the suction base of the dildo onto the floor before slowly lowering yourself.'
+			'Shivers run down your spine as you feel the thick head spreading your pussy lips and soon the whole length starts to slide deep inside your hole. A throaty moan overwhelms the room when it finally bottoms out inside you, sending you to the heavens and back.'
+			'After shifting your legs and getting more comfortable, you start to rock your hips and bounce on it, moaning louder and louder as you keep increasing the power and pace of your thrusts. You''re soon hammering your ass against the cold floor time and it takes you just a few minutes to reach orgasm, your toes curling tightly as a wonderful feeling run through your entire body.'
+			'You''re soon twitching on the dildo and juices drip down its length, soaking the floor beneath you. You take a few deep breaths and a smile grows along your face. That was just what you needed!'
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 			gs 'arousal', 'end'
 			
-			act 'Breathe':gt 'sitr'
+			act 'Breathe': gt 'sitr'
 		end
 	end
 end
-if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
+if pcs_horny >= 50: act 'Masturbate': gt 'selfplay', 'start'
+
 --- sitr ---------------------------------
 

locations/sitr2x.qsrc

@@ -43,7 +43,7 @@ if obruch > 0:'Your hula hoop stands in a corner.'
 if skak > 0:'Your jump rope is on a shelf.'
 if bookYog > 0:'Your book on yoga and your yoga mat are in the cabinet.'
 
-if mishka > 0:iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + ' on a shelf.'
+if mishka > 0:iif(mishka = 1, 'Your teddy bear is', 'Your <<mishka>> teddy bears are') + 'sitting on a shelf.'
 if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'
 *nl
 
@@ -55,7 +55,7 @@ gs 'exercise', 'start'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
-		'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
+		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sitting on the couch watching television.'
 		gs 'music_actions', 'not_alone'
 	else
 		gs 'music_actions', 'clear_restrictions'
@@ -66,7 +66,7 @@ if husband > 0 and husbandrinkday = daystart and hour >= 20 and hour <= 23: gs '
 
 gs 'music_actions', 'music_icon'
 
-gs'subkid'
+gs 'subkid'
 
 act 'Go out on the balcony': gt 'balkon','start'
 
@@ -75,8 +75,7 @@ gs 'events', 'read'
 
 if dildo > 0 and pcs_horny >= 50:
 	act 'Masturbate':
-		cla
-		*clr
+		*clr & cla
 		if pcs_inhib < 30:inhib_exp += rand(1,3)
 
 		if husband > 0 and husbandrink ! 10:

locations/sitrPar.qsrc

@@ -22,10 +22,10 @@ if $ARGS[0] = '':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></center>'
 	end
-	act 'Leave the room':gt 'korrPar'
-	act 'Sit on the sofa':gt 'sitrPar', 'sofa'
+	act 'Leave the room': gt 'korrPar'
+	act 'Sit on the sofa': gt 'sitrPar', 'sofa'
 	''
-	'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a>, which is near the window. In front of the TV is a <a href="exec:gt ''sitrPar'',''sofa''">sofa bed</a>, on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
+	'The living room has a <a href="exec:gt ''TV'',''pav''">TV</a> near the window. In front of the TV is a <a href="exec:gt ''sitrPar'',''sofa''">sofa bed</a> on which your brother sleeps at night. A large tapestry covers one wall, while the other wall has several shelves on it, stocked with books and other things.'
 	*nl
 	if locat['Fam_livingroom'] = 0 and locat['Mother'] ! 24 and locat['Mother'] ! 19:
 		'No one else is here right now, so you''re free to use the room how you like.'
@@ -33,23 +33,23 @@ if $ARGS[0] = '':
 	end
 
 	if locat['Kolka'] = 2 and brothermorningsex = daystart:
-		'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
+		'<a href="exec:gt ''brother'', ''start''">Kolka</a> is getting ready for school.'
 	elseif locat['Kolka'] = 1:
-		'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
+		'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sleeping on the sofa.'
 	elseif locat['Kolka'] = 7:
-		'Your little brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
+		'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting by the table and doing his homework.'
 	elseif locat['Kolka'] = 11:
 		if locat['Mother'] = 19 or locat['Stepdad'] = 10:
-			'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair, playing on his phone.'
+			'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting in the armchair playing on his phone.'
 		else
-			'Your younger brother <a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa, playing video games.'
+			'<a href="exec:gt ''brother'', ''start''">Kolka</a> is sitting on the sofa playing video games.'
 		end
 	end
 	*nl
-	if month = 12 and day >= 20:'A Christmas tree stands next to the TV, decorated with tinsel garlands and other ornaments.'
+	if month = 12 and day >= 20: 'A Christmas tree stands next to the TV, decorated with tinsel garlands and other ornaments.'
 	if month = 12 and day = 31 and hour >= 20:
 		act 'Celebrate the New Year with your family.':
-			cls
+			cla
 			gs 'npc_relationship', 'modify', 'A29', 10
 			gs 'npc_relationship', 'modify', 'A28', 10
 			gs 'npc_relationship', 'modify', 'A33', 10
@@ -62,12 +62,13 @@ if $ARGS[0] = '':
 			pcs_mood += 100
 			gs 'food', 'l_meal'
 			gs 'stat'
-			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your <<$npc_nickname[''A29'']>> gives you an envelope with a greeting card and 5000 <b>₽</b>. For a while, you continue to watch TV, enjoying the champagne and company of your family, but eventually, everyone is kind of tired and one by one they go to bed.'
+			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten as everyone is has fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside as your mother gives you an envelope with a greeting card and 5000 <b>₽</b>.' 
+			'You continue to watch TV and enjoy the champagne and company of your family, but everyone eventually grows tired and they go to bed, one by one.'
 
 			act 'Leave': gt 'korrPar'
 		end
 	elseif month = 1 and day = 1:
-		act 'Eat some leftovers at the festive table.':
+		act 'Eat some leftovers at the festive table':
 			frost = 0
 			minut += 10
 			pcs_health += 10
@@ -94,22 +95,22 @@ if $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
 		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			if CloStyle2 = 4:
-				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that, she practically pushes you out of the apartment and closes the door. As she does, she adds once more, "Go to school."' 
-				act 'Continue': gt'pod_ezd','etaj_2'
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here? Go to school, now!" She practically pushes you out of the apartment and closes the door.' 
+				act 'Continue': gt 'pod_ezd','etaj_2'
 			else
 				gs 'wardrobe', 'school_outfit'
-				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing home? Why are you not wearing your uniform? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform. After that, she practically pushes you out of the apartment and closes the door. As she does, she adds once more, "Go to school."' 
-				act 'Continue':  gt'pod_ezd','etaj_2'
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here and ehy are you not wearing your uniform? Get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform. After that, she practically pushes you out of the apartment and closes the door.' 
+				act 'Continue': gt 'pod_ezd','etaj_2'
 			end
 		else
-			'As you walk into the living room, you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
+			'As you walk into the living room, you see your mother sweeping the floor. She hasn''t noticed you because she''s intent on cleaning.'
 			act 'Leave': gt 'korrPar'
 		end
 		exit
 	elseif locat['Mother'] = 19 and locat['Stepdad'] = 10:
 		!! Watches TV with Vladimir
 		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
-		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV.'
+		'As you walk into the living room, you see your mother and Vladimir sitting on the couch watching TV.'
 		act 'Leave':gt 'korrPar'
 		
 		act 'Join them':
@@ -121,7 +122,7 @@ if $ARGS[0] = '':
 			npc_rel['A34'] += 1
 			gs 'stat'
 			!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-			'You move over to join them, and your <<$npc_nickname[''A29'']>> scoots away from Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV. Your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
+			'You move over to join them, and your mother scoots away from Vladimir and pats the spot between her and him. You take a seat between them and Vlad barely even glances at you with a brief smile before he goes back to watching TV. Your mother pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
 			act 'Leave':gt 'korrPar'
 			
 			act 'Keep watching':gt 'sitrPar', 'TVfam'
@@ -129,7 +130,7 @@ if $ARGS[0] = '':
 		end
 	elseif locat['Mother'] = 19:
 		!!Mom by herself watching TV
-		'As you walk into the living room, you see your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> sitting on the couch watching TV.'
+		'As you walk into the living room, you see your <a href="exec:gt''mother''">mother</a> sitting on the couch watching TV.'
 	elseif locat['Stepdad'] = 10:
 		!!Dad watching TV by himself
 		'Your <a href="exec:gt ''father''">stepfather</a> is sitting on the sofa, watching TV.'
@@ -153,7 +154,7 @@ if $ARGS[0] = '':
 	end
 end
 
-if $ARGS[0]='sofa':
+if $ARGS[0]= 'sofa':
 	$menu_loc = 'sitrPar'
 	$menu_arg = 'sofa'
 	menu_off = 0
@@ -166,14 +167,14 @@ if $ARGS[0]='sofa':
 	*nl
 	'<center>A small sofa bed, when not folded out into a bed, is just big enough for you to curl up on and take a nap.</center>'
 
-	act 'Get up':gt 'sitrPar'
-	act 'Watch TV':gt 'TV','pav'
+	act 'Get up': gt 'sitrPar'
+	act 'Watch TV': gt 'TV','pav'
 
 	if locat['Fam_livingroom'] = 0 and pornMagazine > 0:
-		'<br>There is a porn magazine under the sofa cushions'
+		'<br>There is a porn magazine under the sofa cushions.'
 		gs 'events', 'read_porn'
 		if pcs_horny >= 50:
-			act 'Masturbate':gt 'selfplay', 'start'
+			act 'Masturbate': gt 'selfplay', 'start'
 		end
 	end
 
@@ -186,11 +187,11 @@ if $ARGS[0]='sofa':
 				pcs_health += 5
 				minut += 60
 				gs 'stat'
-				'You sleep about an hour.'
+				'You sleep for about an hour.'
 			else
 				minut += 5
 				gs 'stat'
-				'You are not tired enough to sleep, even for a short nap.'
+				'You''re not tired enough to sleep, even for a short nap.'
 			end
 		end
 	end
@@ -203,7 +204,7 @@ if $ARGS[0] = 'TVfam':
 	gs 'family_schedule'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
+	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or your mother.'
 	if locat['Mother'] = 19: act 'Keep watching TV with your family': gt 'sitrPar', 'TVfam'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end
@@ -213,8 +214,8 @@ if $ARGS[0] = 'TVend':
 	gs 'family_schedule'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-	'Once the show is over, Vladimir picks up the remote and turns the TV off. He gets up then stretches before he turns and walks out of the room, likely heading to bed. <<$npc_nickname[''A29'']>> gets up and says to you, "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka and says to him, "Don''t stay up, go to bed." With that, she also leaves after making sure you leave as well. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
-	act 'Leave':gt 'korrPar'
+	'Once the show is over, Vladimir picks up the remote and turns the TV off. He gets up and stretches before he turns and walks out of the room, likely heading to bed. Your mother also gets up. "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka. "Don''t stay up, go to bed." She then ushers you out of the room. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
+	act 'Leave': gt 'korrPar'
 end
 
 if $ARGS[0] = 'occupied':

locations/sportShop.qsrc

@@ -119,6 +119,10 @@ if $ARGS[0] = 'shoes':
 	$loc = 'sportShop'
 	cls
 	gs'stat'
+	'<center><b><font color="maroon">Viewing G&M shoes</font></b></center>'
+	*nl
+
+	gs 'shoes', 'shop_filter_header'
 
 	act 'Return':
 		cla
@@ -126,11 +130,28 @@ if $ARGS[0] = 'shoes':
 		gt 'sportShop', 'start'
 	end
 
-	i = 1
-	:loopdanilovich_shoes
-		if danilovich_shoe[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
-		i += 1
-	if i <= 40:jump 'loopdanilovich_shoes'
+	!!To filter just this set
+	clo_i = 0
+	:loopshoequality_filter
+
+		i = 1
+		:loopdanilovich_shoes
+			if danilovich_shoe[i] = 0:
+				gs 'shoe_attributes', 'danilovich', i
+				gs 'shoes', 'shoe_filter'
+				if (Shofilter['quality'] = 0 and ShoQuality = clo_i) or Shofilter['number'] = 0:
+					if Shofilter['inc'] = 1 and Shofilter['only'] = 1:
+						*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''training_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
+					end
+				end
+			end
+			i += 1
+		if i <= 40:jump 'loopdanilovich_shoes'
+
+	clo_i += 1
+	if Shofilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopshoequality_filter'
+	end
 end
 
 if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 1500
@@ -194,18 +215,33 @@ if $ARGS[0] = 'panties':
 	cls
 	gs'stat'
 
+	gs 'panties', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'sportShop', 'start'
 	end
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:looppantyquality_filter
 
-	:loopdanilovich_panties
-		if danilovich_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 8:jump 'loopdanilovich_panties'
+		i = 1
+
+		:loopdanilovich_panties
+			if danilovich_panties[i] = 0:
+				gs 'underwear_attributes', 'danilovich_panties', i
+				if (clothingfilter['quality'] = 0 and PanQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/items/danilovich/panties/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 8:jump 'loopdanilovich_panties'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'looppantyquality_filter'
+	end
 end
 
 if $ARGS[0] = 'panties2':
@@ -226,18 +262,33 @@ if $ARGS[0] = 'bras':
 	cls
 	gs'stat'
 
+	gs 'bras', 'shop_filter_header'
+
 	act 'Return':
 		cla
 		minut += 1
 		gt 'sportShop', 'start'
 	end
 
-	i = 1
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
 
-	:loopdanilovich_bras
-		if danilovich_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a> '
-		i += 1
-	if i <= 8:jump 'loopdanilovich_bras'
+		i = 1
+
+		:loopdanilovich_bras
+			if danilovich_bras[i] = 0:
+				gs 'underwear_attributes', 'danilovich_bras', i
+				if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+					*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a> '
+				end
+			end
+			i += 1
+		if i <= 8:jump 'loopdanilovich_bras'
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 6:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'bras2':

locations/stat_display.qsrc

@@ -93,7 +93,7 @@ $stat_disable_msg = 'Menu is disabled for this event.'
 !$stat_msg += '<<$weather>><BR>'
 !pl '<<$weatherImage>>'
 gs 'emp_functions', 'evt_day_suffix'
-if timeHidden = 0: $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>><<$evt_suffix>> <<$month>> <<year>>'
+if timeHidden = 0: $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>><<$date_suffix>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
 if mid($start_type,1,2) = 'sg' and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'

locations/therapist.qsrc

@@ -2785,19 +2785,19 @@ end
 
 !!To be used if you went to somewhere after therapist fucking you
 if $ARGS[0] = 'therapistFucked':	
-		therapistFuckedPussyScene = 0
-		*clr
-		cla
+	therapistFuckedPussyScene = 0
+	*clr
+	cla
 
-		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/toSchool.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/toSchool.mp4"></video></center>'
 
-		'You subconsciously notice your therapist''s sperm slowly leaking out of your cum filled pussy.' 
-		'You feel happier because of this.'
-		pcs_mood += 1
+	'You subconsciously notice your therapist''s sperm slowly leaking out of your cum filled pussy.' 
+	'You feel happier because of this.'
+	pcs_mood += 1
 
-		act 'continue': 
-			gt $menu_loc, $menu_arg
-		end
+	act 'continue': 
+		gt $menu_loc, $menu_arg
+	end
 end
 
 $pavlov = {
@@ -2818,9 +2818,13 @@ $RestTherapyVariables ={
     killvar 'hypnoHardToCum'
     killvar 'therapistday'
     killvar 'hypnoPanty'
+    killvar 'hypnoCheckPanties'
+    killvar 'hypnoFlashGreet'
     killvar 'bedPanty'
     killvar 'hypnoBra'
+    killvar 'hypnoClothes'
     killvar 'hypnoStage'
+    killvar 'dreamedOfTherapistFucking'
     killvar 'hypnoAddict'
     killvar 'therapistWantsSlave'
     killvar 'hypnoAddict'

locations/underwear_attributes.qsrc

@@ -46,7 +46,8 @@
 !!							1 - regular
 !!							2 - sports
 !!
-!! PanQuality/BraQuality:	1-6 scale, based on the general expensiveness of the underwear. Higher is better quality. (Bodysuit uses BraQuality)
+!! (bodysuit uses BraQuality)
+!! PanQuality/BraQuality:	1-6 scale, based on the general expensiveness of the underwear. Higher is better quality.
 !! 					Ex:		6-5 are the higher and lower levels of the expensive category
 !!							3-4 are the same for average category
 !!							2-1 are the same for cheap category.

locations/underwear_bodysuits.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'view_bodysuit_list':
 		metka_bodysuits = 2
 	end
 
-	gs 'underwear_bodysuits', 'filter_header', 'store'
+	gs 'underwear_bodysuits', 'filter_header'
 
 	'<center><table border=1><TH><a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_list'', ''wardrobe''">Draw</a></TH><TH><a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_list'', ''unwanted''">Unwanted</a></TH></table></center>'
 
@@ -456,27 +456,10 @@ if $ARGS[0] = 'filter_header':
 	end
 
 
-	$Headerstring[2] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Include</TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH><TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Sort by</TH><TH></TH>'
 
-	$Headerstring[3] = ''
-	if $ARGS[1] ! 'store':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	$Headerstring[3] += '<TH>Only show</TH>'
+	$Headerstring[2] = '<TH>Include</TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH>Only show</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
 	'<TR><border=1><<$Headerstring>>'
@@ -508,16 +491,8 @@ if $ARGS[0] = 'bodysuit_filter':
 end
 
 if $ARGS[0] = 'shop_filter_header':
-!! exclude filters
-	$Headerstring = '<TD>'
-	if clothingfilter['sport'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	end
-
 !! sort by filters
-	$Headerstring += '<TD>'
+	$Headerstring = '<TD>'
 	if clothingfilter['number'] = 0:
 		clothingfilter['quality'] = 1
 		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
@@ -532,40 +507,15 @@ if $ARGS[0] = 'shop_filter_header':
 		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
 	end
 
-!! Show only filers
-	$Headerstring[1] = '<TD>'
-	if clothingfilter['sport_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
-	end
 
-
-	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH><TH>Include</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
-
-	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH><TH>Only show</TH>'
+	$Headerstring[2] = '<TH>Sort by</TH>'
 
 	'<center><table><<$Headerstring[2]>>'
-	'<TR><border=1><<$Headerstring>>'
-
-	'<TR><border=0><<$Headerstring[3]>>'
-	'<TR><border=1><<$Headerstring[1]>></table></center>'
+	'<TR><border=1><<$Headerstring>></table></center>'
 end
 
 if $ARGS[0] = 'shop_filter':
-!!Exclude filters
-	clothingfilter['inc'] = 1
-	!!filters, if inc set to 0 they will not display
-	if clothingfilter['sport'] = 1 and BraFun = 2:
-		clothingfilter['inc'] = 0
-	end
 
-!!only filters
-	clothingfilter['only'] = 0
-	!!filters, if only set to 1 they will only display those set
-	if clothingfilter['sport_only'] = 1 and BraFun = 2:
-		clothingfilter['only'] += 1
-	end
 end
 
 

locations/vasilyhome.qsrc

@@ -969,7 +969,7 @@ if $ARGS[0] = 'vasily_lern':
 				act 'You''re not in the mood (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act iif(pcs_horny >= 50, 'You''re already wet', 'Oh, I suppose'): gt 'vasily_home_sex', 'vasily_lern_sex_yes'
-		elseif fame['pav_slut'] < 150:
+		else
 			'"<<$pcs_nickname>>, if you would like to keep learning, I''ve been told that I''m an excellent teacher," Vasily says as he gently starts to paw at you.'
 			'You have a sneaking suspicion that he isn''t talking about the biology assignment.'
 			'"I... Don''t know... Would you please..." you stammer.'