Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/JuliaMilHome.qsrc

@@ -589,10 +589,10 @@ if $ARGS[0] = 'julia_chat':
 				act 'Stop talking': gt 'JuliaMilHome','julia_room'
 				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
 			end
-			act 'Say nothing, just hug him back':
+			act 'Say nothing, just hug her back':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-				'You kiss her and hug her back. You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
+				'You kiss her and hug her back. You have never seen her look so happy, she looks at you like you are the most amazing thing in the world. She kisses you for a moment before shyly breaking away and putting a little space between you, but she holds your hand as you both sit on the bed.'
 
 				act 'Stop talking': gt 'JuliaMilHome','julia_room'
 				act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'

locations/booty_call_doggy.qsrc

@@ -541,7 +541,7 @@ if $ARGS[0] = 'doggy3':
 							'But despite your desperate screams, <<$npc_firstname[$boy]>> doesn''t even slow down, instead continuing to pummel you from behind as you cry in terror.'
 							gs 'booty_call_cum', 'fuck_cum'
 						else
-							act'Continue':gs 'booty_call_talk2', 'rape_explain'
+							act'Continue':gs 'booty_call_talk', 'rape_explain'
 						end
 					end
 				end

locations/bras.qsrc

@@ -408,6 +408,15 @@ if $ARGS[0] = 'dispose':
 	lastwornbranumber = 0
 	$braworntype = 'none'
 	brawornnumber = 0
+	PBraMaterial = 0
+	PBraType = 0
+	PBraFun = 0
+	PBraQuality = 0
+	PBraThinness = 0
+	PBraCover = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'remove':
@@ -417,6 +426,15 @@ if $ARGS[0] = 'remove':
 	$braworntype = 'none'
 	brawornnumber = 0
 	underwear['lastworntype'] = 0
+	PBraMaterial = 0
+	PBraType = 0
+	PBraFun = 0
+	PBraQuality = 0
+	PBraThinness = 0
+	PBraCover = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear':
@@ -463,6 +481,9 @@ if $ARGS[0] = 'wear2':
 	PBraQuality = BraQuality
 	PBraThinness = BraThinness
 	PBraCover = BraCover
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear_last_worn':

locations/camera.qsrc

@@ -236,7 +236,13 @@ if $ARGS[0] = 'mother':
 		'You show her your photos and the one you finally decided on. "Here, look, this is the one I will use for my portfolio."'
 		'She smiles. "They do look nice... I still say it''s a waste of time, though."'
 		'You roll your eyes. "I know, <<$npc_nickname[''A29'']>>," you reply as she walks back inside.'
-		act 'Put your camera away': gt 'pav_complex', 'start'
+		act 'Put your camera away':
+			if $loc = 'kuhrPar' or $loc = 'sitrPar':
+				gt 'pav_complex', 'start'
+			else
+				gt 'gaddvor'
+			end
+		end
 	end
 end
 

locations/cikl.qsrc

@@ -858,7 +858,7 @@ if mid($start_type,1,2) = 'sg':
 				:hotcat_calc_jump
 				i += 1
 				
-				if hotcat_rating['A<<i>>'] = 0: jump 'hotcat_calc_jump'
+				if hotcat_rating['A<<i>>'] = 0 and i < 145: jump 'hotcat_calc_jump'
 				
 				switch_rand = rand(1,100)
 				

locations/clothing.qsrc

@@ -1669,8 +1669,8 @@ if $ARGS[0] = 'dispose':
 	dynamic $clothingworntype + '[<<clothingwornnumber>>] = 0'
 	$lastwornclothingtype = 'none'
 	lastwornclothingnumber = 0
-	$clothingworntype = 'none'
-	clothingwornnumber = 0
+
+	gs 'clothing', 'strip_code'
 end
 
 if $ARGS[0] = 'strip':
@@ -1700,6 +1700,10 @@ if $ARGS[0] = 'strip':
 
 	killvar '$strip_loc'
 
+	gs 'clothing', 'strip_code'
+end
+
+if $ARGS[0] = 'strip_code':
 	$clothingworntype = 'nude'
 	clothingwornnumber = 0
 	CloQuality = 0
@@ -1735,6 +1739,12 @@ if $ARGS[0] = 'strip':
 	PXCloThinness = 0
 	PXCloTopCut = 0
 	PXCloBottomShortness = 0
+	PCloCoverTop = 4
+	PCloCoverBack = 4
+	PCloCoverFront = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 
@@ -1809,6 +1819,12 @@ if $ARGS[0] = 'wear':
 		PCloBimbo = CloBimbo
 	end
 
+	PCloCoverTop = CloCoverTop
+	PCloCoverBack = CloCoverBack
+	PCloCoverFront = CloCoverFront
+
+	gs 'clothing', 'exposure_calc'
+
 	if PCloTopCut > 1:
 		if tits = 2 or tits = 3: PCloTopCut += 1
 		if tits >= 4: PCloTopCut += 2
@@ -1898,6 +1914,20 @@ if $ARGS[0] = 'wear':
 	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis': PCloswimwear = 1
 end
 
+if $ARGS[0] = 'exposure_calc':
+	CoverTop = (PCloCoverTop + PBraCover)
+	CoverTop = CoverTop - 4
+	if CoverTop < 0: CoverTop = 0
+
+	CoverBack = (PCloCoverBack + PPanCoverBack)
+	CoverBack = CoverBack - 4
+	if CoverBack < 0: CoverBack = 0
+
+	CoverFront = (PCloCoverFront + PPanCoverFront)
+	CoverFront = CoverFront - 4
+	if CoverFront < 0: CoverFront = 0
+end
+
 if $ARGS[0] = 'wear_last_worn':
 	!!contingency
 	if $lastwornclothingtype = '': $lastwornclothingtype = 'nude'

locations/exhibitionistshop.qsrc

@@ -18,6 +18,14 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/exhibitshop/shop.jpg"></center>'
 	'A shop in the most modern style who''s clothing is all very revealing and not nearly as classy as the store itself.'
 
+	if hypnoClothes = 1 and exhibitionQW = 4:
+		act 'Look for Ksenya': gt 'exhibitionistshop', 'ksenya_intro'
+	end
+	
+	if exhibitionQW = 5 and exhibitionQW['daystart'] ! daystart:
+		act 'Talk to Ksenya': gt 'exhibitionistshop', 'ksenya_chat'
+	end
+
 	act 'Leave':
 		minut += 5
 		gt 'liames'
@@ -54,6 +62,58 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'ksenya_intro':
+	exhibitionQW = 5
+	exhibitionQW['daystart'] = daystart
+	gs 'willpower', 'misc', 'force', 'hard'
+	minut += 2
+	cla & *clr
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya7.jpg"></center>'
+	'"Hello? I''m looking for Ksenya, is she around?"'
+	'The cashier nods. "Yes, follow me," she says, leading you to the back of the store.'
+	'"Miss Ksenya? You have a visitor" The cashier takes you into the break room that looks really comfortable. Large double-pane windows that look out on the back patio. She stands up and comes over to give you a hug. "Hey <<$pcs_firstname>>, what can I do for you?"'
+	'"I was wondering if you had school uniforms? My therapist told me that you might have some in your shop." You said.'
+	'"The one in town?" She asks.'
+	'"Yes? Do you know him?" You replied.'
+	'She sighs. "Yes, that''s my father. He''s asked me to keep them in stock for some reason" she admits. "If we don''t have one right now, check back in a few days and we might have one" she offers. "Tell me, has" she pauses "anything changed recently?" she asks. "Like has anything recently been different, wearing things you haven''t before? doing things you don''t normally haven''t been doing?" she questions.'
+	'You take a moment to think about things.'
+	act 'No':
+		cla & *clr
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya8.jpg"></center>'
+		'"No? Why?" you ask.'
+		'"No reason, sorry. If you ever want to hang out, just stop by the shop and we can chat." She says as she walks you back to the front of the store.'
+		act 'Continue': gt 'exhibitionistshop', 'start'
+	end
+	if will_cost <= pcs_willpwr:
+		act 'Yes':
+			gs 'willpower', 'pay', 'hard'
+			cla & *clr
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya8.jpg"></center>'
+			'In response, you reply, "Yes?" I no longer like wearing underwear. "Are you referring to that?" you inquire.'
+			'"Is he doing hypnosis with you?" You nod your head. She informs you, "I think you may be in trouble if you continue seeing him."'
+			'"Nothing has happened to me that I am aware of." You assure her'
+			'"I trust you, but please let me know if anything happens. My father is not trustworthy, so please be careful. She walks you out of the shop after giving you a hug. If you ever want to talk to me, please come see me." She says as she walks you back to the front of the store.'
+			act 'Continue': gt 'exhibitionistshop', 'start'
+		end
+	else
+		act 'Yes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+end
+
+if $ARGS[0] = 'ksenya_intro':
+	exhibitionQW['daystart'] = daystart
+	npc_rel['A263'] += 1
+	minut += 10
+	cla & *clr
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya9.jpg"></center>'
+	'You meet up with Ksenya at her shop and spend the next hour talking about random things. About flashing, clothing, and just everyday stuff.'
+	act 'Continue': gt 'exhibitionistshop', 'start'
+end
+
 if $ARGS[0] = 'outfits':
 	$loc_arg = 'outfits'
 	$loc = 'exhibitionistshop'

locations/home_activity.qsrc

@@ -350,7 +350,7 @@ end
 			gt 'city_house_res_bathr', 'bathr'
 		elseif $loc = 'mey_home':
 			!! location = 'Meynold Household'
-			gt 'mey_home', '2'
+			gt 'mey_home', 'bathroom'
 		end}
 !! --------------- end vomiting ----------------------------
 --- home_activity ---------------------------------

locations/katja_dorm.qsrc

@@ -1091,7 +1091,7 @@ end
 
 if $ARGS[0] = 'watch_movie':
 	if katjaQW['relationship_cont_start'] + 350/(1+ katjaQW['boy_block']) < daystart and hour < 21 and katjaQW['relationship_talk'] = 0:
-		gt 'katja_dorn', 'relationship_talk'
+		gt 'katja_dorm', 'relationship_talk'
 	end
 	cla & *clr
 	locat['katja_save2'] = 20

locations/kseniyaQW.qsrc

@@ -10,11 +10,11 @@ if $ARGS[0] = 'event1':
 	gs 'stat'
 
 	'<center><b><font color="maroon">Woman</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/flash.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya1.jpg"></center>'
 	if ARGS[1] = 1:
-		'As you wander through the park you see someone in a field, who waves you over. As you get closer you realise it is a topless woman, she gives you an enigmatic smile while cupping a breast then runs off.'
+		'As you wander through the park you see someone in a field, who waves you over. As you get closer you realise it is a pretty looking woman of some kind of Asian descent, she gives you an enigmatic smile then runs off.'
 	else
-		'As you look for somewhere to expose yourself you see someone in a field, who waves you over. As you get closer you realise it is a topless women, she gives you an enigmatic smile while cupping a breast then runs off.'
+		'While searching for a place to expose yourself, you catch sight of a woman between some tall stalks of grass in the corner of your eye. Although it is difficult to see her face, you can see her large chest, and she appears to be a pretty looking woman of some kind of Asian descent. When you finally decide to meet her, you discover that she has already disappeared.'
 	end
 
 	act 'Finish walk': gt $loc, $loc_arg
@@ -34,7 +34,7 @@ if $ARGS[0] = 'events':
 			end
 		end
 	elseif exhibitionQW = 2:
-		act 'Search for Kseniya':
+		act 'Search for Ksenya':
 			if hour > 9 and hour <= 18 and rand(0,3) = 0:
 				gt 'kseniyaQW', 'event3'
 			else
@@ -55,47 +55,47 @@ if $ARGS[0] = 'event2':
 	exhibitionQW = 2
 	if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 	gs 'stat'
-
-	'<center><b><font color="maroon">Kseniya</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/kseniya1.jpg"></center>'
-	'You find the flashing woman in just her panties by the stream, near the edge of the park. She covers one of her breasts and feigns embarrassment, but you know better.'
-	'She smiles and says, "Hi, I''m Kseniya. I saw you before, you weren''t shocked or surprised. Is this something you''re into as well?"'
-	'You can hardly lie to the near naked woman in front of you. "Yeah, I like to show off too. I''m <<$pcs_firstname>>, pleased to meet you."'
-	'"Cool, can I ask you for an odd favour?" Without waiting for a reply she continues, "Can you take a couple of pictures of me on my phone?"'
+	'<center><b><font color="maroon">ksenya</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya2.jpg"></center>'
+	'While looking for the flashing woman, you find her kneeling near some tall grass. Without thinking, you walk up to her.'
+	'"Hello" you say.'
+	'This causes her to jump a tad. "Oh, Hi" she says covering her nipples with her hands. "I''m Ksenya." She stands up and offers a hand. "I''ve seen you before" she replies. "Flashing people around the park here. It''s really nice to come across someone who likes to flaunt what they got" she jokes. "Hey, um, I was wondering if you could help me with some pictures..., um." Since she didn''t ask your name, she is confused.'
+	'You realise her mistake and say, "I''m <<$pcs_firstname>>"'
+	'"Right, can I ask if you could help me with some pictures?" You see, I want to be a model, and I need some pictures. Can you help?" she asks."'
 	act 'Sure, why not?':
 		cls
 		minut += 5
 		gs 'exp_gain', 'photoskl',2
 		gs 'stat'
-		'<center><b><font color="maroon">Kseniya</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/kseniya2.jpg"></center>'
-		'"Thank you, I wanted to see how I looked. I''m thinking about doing some nude modelling. Here, take my phone."'
-		'As you check over her phone, working out how to take pictures, Kseniya hides behind some bushes and removes her panties.'
-		'She comes back out but is still partially obscured. She is holding a flower and starts posing. You frame the shot and take what you think is a nice picture.'
+		'<center><b><font color="maroon">ksenya</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya3.jpg"></center>'
+		'"I want some tasteful teasing pictures to send to some agents. Let me show you where I wanna start." She says and hands you her phone and then walks towards the field. You take a look at her phone to get it set and take a picture by mistake of her back. "Oops" you think to yourself'
 		act 'Continue':
 			cls
 			minut += 5
 			gs 'exp_gain', 'photoskl',2
 			gs 'stat'
-			'<center><b><font color="maroon">Kseniya</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/kseniya3.jpg"></center>'
-			'Kseniya claps with joy reminding of an excited puppy, before she runs around to a clearer break in the bushes.'
-			'She strikes a pose, showing the full length of her body turned to the side, while she pretends to be sniffing the wild flowers.'
-			'You carefully line up the frame and take another picture.'
-			'Kseniya looks at you and says, "OK, one more over there in the open, but try and be a bit quicker or I might lose my nerve."'
+			'<center><b><font color="maroon">ksenya</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya4.jpg"></center>'
+			'When she reaches a nearby tree, she removes her sheer, see-through dress and holds on to it herself. You take another shot, this time on purpose. She looks up at you and smiles which gets another picture. After one or two more.'
 			act 'Continue':
 				cls
 				minut += 5
 				gs 'exp_gain', 'photoskl',2
 				gs 'stat'
-				'<center><b><font color="maroon">Kseniya</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/kseniya4.jpg"></center>'
-				'With a quick look to check if it''s clear, Kseniya runs over to the nearby field and poses against a bail of hay.'
-				'You line up the phone as fast as you can and take a picture, she immediately runs up to you and kisses you on the check as she takes back her phone.'
-				'"I''ll do you next time!" she shouts as she runs back into the bushes where her clothes are stashed.'
-				'You take that as your cue to leave and head back into the park.'
-
-				act 'Leave': gt $loc, $loc_arg
+				'<center><b><font color="maroon">ksenya</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya5.jpg"></center>'
+				'She says "Ok, one more." She says and moves behind some tall grass. She removes all her clothes and stands naked behind it. You snap one or two more pictures before she walks up to you, getting dressed.'
+				act 'Continue':
+					cls
+					minut += 5
+					gs 'exp_gain', 'photoskl',2
+					gs 'stat'
+					'<center><b><font color="maroon">ksenya</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya6.jpg"></center>'
+					'She walks over to you now wearing her sheer dress, and takes her phone back. "These are cute," she says looking at them. "Ever thought of doing photography?" she says and then gives you a kiss on your cheek before she runs off with a wave and a final word "See you around"'
+					act 'Leave': gt $loc, $loc_arg
+				end
 			end
 		end
 	end
@@ -107,9 +107,9 @@ if $ARGS[0] = 'event3':
 	minut += 5
 	gs 'stat'
 
-	'<center><b><font color="maroon">Kseniya</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/flash.jpg"></center>'
-	'As you did before you find Kseniya near the edge of the park, exposing herself. She gives you that same look, you just can''t seem to place.'
+	'<center><b><font color="maroon">ksenya</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/ksenya6.jpg"></center>'
+	'As you did before you find Ksenya near the edge of the park, exposing herself. She gives you that same look, you just can''t seem to place.'
 	'"Hi, <<$pcs_firstname>>. It''s your turn, are you up for this?"'
 
 	act 'No, sorry':
@@ -126,15 +126,15 @@ if $ARGS[0] = 'event3':
 		exhibitionQW = 3
 		if exhibitionist_lvl < 2: exhibitionist_lvl = 2
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip1.jpg"></center>'
 		'Cool, the light is not great here at this time, but there''s a great spot just around the corner.'
-		'She leads you to a small clearing and you start to undress. Kseniya gives you a bag for your clothing, "So they''ll stay safe and clean."'
+		'She leads you to a small clearing and you start to undress. Ksenya gives you a bag for your clothing, "So they''ll stay safe and clean."'
 		if $pantyworntype ! 'none':
 			act 'Take your panties off':
 				*clr
 				cla
-				'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip2.jpg"></center>'
-				'You look at Kseniya, who seems busy checking if there''s no one around. Eventually you decide to remove your panties, here goes nothing!'
+				'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip2.jpg"></center>'
+				'You look at Ksenya, who seems busy checking if there''s no one around. Eventually you decide to remove your panties, here goes nothing!'
 
 				act 'Continue': gt 'kseniyaQW', 'event3_1'
 			end
@@ -145,7 +145,7 @@ if $ARGS[0] = 'event3':
 end
 
 if $ARGS[0] = 'event3_1':
-	'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip3.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip3.jpg"></center>'
 	'You stand up completely naked, with everything but your shoes in the bag.'
 	'"Oh crap, I packed my phone. I ment to give it to you, how are you going to take pictures of me now?" you tell her.'
 	'"It''s OK <<$pcs_firstname>>, I can take the pictures on my phone and message them to you. What''s your number?"'
@@ -158,8 +158,8 @@ if $ARGS[0] = 'event3_1':
 	act 'Get started':
 		*clr & cla
 		gs 'exp_gain', 'mdlng', rand(0,2)
-		'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip4.jpg"></center>'
-		'You hand her the bag and strike a pose, Kseniya laughs.'
+		'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip4.jpg"></center>'
+		'You hand her the bag and strike a pose, Ksenya laughs.'
 		'"More natural! Bah, that ugly building is in frame, try doing the same on the path." She points to the track by the clearing.'
 		gs 'arousal', 'flash', 10
 		minut -= 5
@@ -168,9 +168,9 @@ if $ARGS[0] = 'event3_1':
 			*clr & cla
 			gs 'exp_gain', 'mdlng', rand(0,2)
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip5.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip5.jpg"></center>'
 			'You walk over to the path, lift you arms over your head and try to look more natural.'
-			'"Much better." Kseniya takes a couple of pictures, then whispers, "Someone''s coming."'
+			'"Much better." Ksenya takes a couple of pictures, then whispers, "Someone''s coming."'
 			'She points towards a tree by the side of the track.'
 			gs 'arousal', 'flash', 10
 			minut -= 5
@@ -178,7 +178,7 @@ if $ARGS[0] = 'event3_1':
 			act 'Get behind the tree':
 				*clr & cla
 				gs 'exp_gain', 'mdlng', rand(0,2)
-				'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip6.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip6.jpg"></center>'
 				'A man walks past with his dog, he doesn''t seem to notice or care and you quickly relax.'
 				'He is still behind you, as you start posing again. You''re really getting into this and can''t stop smiling.'
 				gs 'arousal', 'flash', 10
@@ -187,17 +187,17 @@ if $ARGS[0] = 'event3_1':
 				act 'One more pose':
 					*clr & cla
 					gs 'exp_gain', 'mdlng', rand(0,2)
-					'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip7.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip7.jpg"></center>'
 					'Still smiling you find a large tree stump and sit down on it. You realise you are exposing yourself quite a bit in this position.'
-					'Kseniya shoots more pictures and you feel yourself relax more.'
+					'Ksenya shoots more pictures and you feel yourself relax more.'
 					gs 'arousal', 'flash', 10
 					minut -= 5
 					gs 'stat'
 					act 'Finish':
 						*clr & cla
 						gs 'exp_gain', 'mdlng', rand(0,2)
-						'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip8.jpg"></center>'
-						'Starting to get concerned you tell Kseniya you are done and want your clothes back.'
+						'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip8.jpg"></center>'
+						'Starting to get concerned you tell Ksenya you are done and want your clothes back.'
 						'She suddenly looks very stern and says, "If you want your clothes, you are going to have to spread those legs."'
 						'She has your clothes, bag and everything, shit this isn''t good.'
 						'You have no real choice so you open up your legs and try to look sexy for the last time.'
@@ -206,17 +206,17 @@ if $ARGS[0] = 'event3_1':
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/strip9.jpg"></center>'
-							'You playfully ask Kseniya if are done now and ask her if you can get your clothes back, hoping a different approach will work.'
+							'<center><img <<$set_imgh>> src="images/locations/shared/park/ksenya/strip9.jpg"></center>'
+							'You playfully ask Ksenya if are done now and ask her if you can get your clothes back, hoping a different approach will work.'
 							'"Over there. Sit down and put your hand between your legs, that''s the one. And make it look sensual," she tells you sounding like a professional photographer.'
 							'As you try and pose you realise your pussy is soaking wet and any lingering inhibition regarding nudity is completely overcome.'
 							gs 'arousal', 'flash', 10, 'sub'
 							gs 'arousal', 'end'
 							minut -= 5
 							gs 'stat'
-							'Kseniya hands you back your clothes and gives you a business card, it''s for a shop in Old Town. How odd.'
+							'Ksenya hands you back your clothes and gives you a business card, it''s for a shop in Old Town. How odd.'
 							'"I know I tricked you there but I find special customers for a very private shop. The address is on the card."'
-							'""You have a lovely body by the way." Kseniya blows you a kiss and leaves. By the time you are dressed she is long gone.'
+							'""You have a lovely body by the way." Ksenya blows you a kiss and leaves. By the time you are dressed she is long gone.'
 							*nl
 							'You look at the card again, "Expression of You," just off Pushkin Okhlopkov Square. Open Mon-Sat, 08:00 - 18:00'
 

locations/mey_home.qsrc

@@ -142,10 +142,10 @@ end
 if $ARGS[0] = 'kitchen':
 	*clr & cla
 	$loc = 'mey_home'
-	$loc_arg = '1'
+	$loc_arg = 'kitchen'
 	$locclass = 'kitr'
 	$menu_loc = 'mey_home'
-	$menu_arg = '1'
+	$menu_arg = 'kitchen'
 	menu_off = 0
 	gs 'kit_din'
 	gs 'stat'
@@ -192,10 +192,10 @@ end
 if $ARGS[0] = 'bathroom':
 	!bathroom
 	$locM = 'mey_home'
-	$locM_arg = '2'
-	$loc_arg = '2'
+	$locM_arg = 'bathroom'
+	$loc_arg = 'bathroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '2'
+	$menu_arg = 'bathroom'
 	menu_off = 0
 	$location_type = 'bathroom'
 	$bathtype = 'glass shower and tub'
@@ -216,11 +216,11 @@ end
 if $ARGS[0] = 'guest_bedroom':
 	cls
 	$locM = 'mey_home'
-	$locM_arg = '3'
+	$locM_arg = 'guest_bedroom'
 	$loc = 'mey_home'
-	$loc_arg = '3'
+	$loc_arg = 'guest_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '3'
+	$menu_arg = 'guest_bedroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Guest room</font></h4></center>'
@@ -286,9 +286,9 @@ end
 if $ARGS[0] = 'lounge':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '4'
+	$loc_arg = 'lounge'
 	$menu_loc = 'mey_home'
-	$menu_arg = '4'
+	$menu_arg = 'lounge'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Lounge</font></h4></center>'
@@ -303,9 +303,9 @@ end
 if $ARGS[0] = 'katja_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '5'
+	$loc_arg = 'katja_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '5'
+	$menu_arg = 'katja_bedroom'
 	menu_off = 0
 	$locclass = 'livingr'
 	gs 'katja_meynold_schedule'
@@ -331,9 +331,9 @@ end
 if $ARGS[0] = 'vicky_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '6'
+	$loc_arg = 'vicky_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '6'
+	$menu_arg = 'vicky_bedroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Vicky''s room</font></h4></center>'
@@ -348,9 +348,9 @@ end
 if $ARGS[0] = 'tamara_bedroom':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '7'
+	$loc_arg = 'tamara_bedroom'
 	$menu_loc = 'mey_home'
-	$menu_arg = '7'
+	$menu_arg = 'tamara_bedroom'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Tamara''s room</font></h4></center>'
@@ -365,9 +365,9 @@ end
 if $ARGS[0] = 'garden':
 	cls
 	$loc = 'mey_home'
-	$loc_arg = '8'
+	$loc_arg = 'garden'
 	$menu_loc = 'mey_home'
-	$menu_arg = '8'
+	$menu_arg = 'garden'
 	menu_off = 0
 	gs 'stat'
 	'<center><h4><font color="maroon">Garden</font></h4></center>'

locations/nerd_game_night.qsrc

@@ -911,7 +911,7 @@ if $ARGS[0] = 'necromancer_adventure':
 	act 'Chat with someone': gt 'nerd_game_night', 'nerd_chat'
 end
 		
-if $ARGS[0] = 'mansion_adventure':
+if $ARGS[0] = 'treasure_map__adventure':
 	*clr & cla
 	nerd_game['treasure_map_adventure'] = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/events/nerd_game/party.jpg"></center>'

locations/npc_reactions.qsrc

@@ -56,12 +56,12 @@ if $ARGS[0] = 'general':
 	if dyneval( 'RESULT =npc_reaction_first_time[''<<$ARGS[1]>>_tan'']') = 1 and pcs_tan = 0: dynamic 'npc_reaction_first_time[''<<$ARGS[1]>>_tan''] = 0'
 	
 	if (cumloc[11] = 1 or cumloc[16] = 1) and dyneval( 'RESULT =npc_reaction_hourly[''<<$ARGS[1]>>_cum_on_face'']') = 0:
-		gt 'npc_reaction', 'cum_on_face'
+		gt 'npc_reactions', 'cum_on_face'
 	elseif (cumloc[6] = 1 or cumloc[7] = 1) and dyneval( 'RESULT =npc_reaction_hourly[''<<$ARGS[1]>>_cum_on_clothes'']') = 0:
-		gt 'npc_reaction', 'cum_on_clothes'
+		gt 'npc_reactions', 'cum_on_clothes'
 	else
 		if func('body_din','pregnancyVisibility') = 1 and dyneval( 'RESULT =npc_reaction_pregnant[''<<$ARGS[1]>>'']') = 0:
-			gt 'npc_reaction', 'pregnant'
+			gt 'npc_reactions', 'pregnant'
 		else
 			i = 0
 			if bimbo_flag = 1 and dyneval( 'RESULT = npc_reaction_weekly[''<<$ARGS[1]>>_bimbo'']') = 0:

locations/panties.qsrc

@@ -410,6 +410,15 @@ if $ARGS[0] = 'dispose':
 	lastwornpantynumber = 0
 	$pantyworntype = 'none'
 	pantywornnumber = 0
+	PPanMaterial = 0
+	PPantyFun = 0
+	PPanQuality = 0
+	PPanThinness = 0
+	PPanCoverFront = 4
+	PPanCoverBack = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'remove':
@@ -419,6 +428,15 @@ if $ARGS[0] = 'remove':
 	$pantyworntype = 'none'
 	pantywornnumber = 0
 	underwear['lastworntype'] = 0
+	PPanMaterial = 0
+	PPantyFun = 0
+	PPanQuality = 0
+	PPanThinness = 0
+	PPanCoverFront = 4
+	PPanCoverBack = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear':
@@ -466,6 +484,9 @@ if $ARGS[0] = 'wear2':
 	PPanThinness = PanThinness
 	PPanCoverFront = PanCoverFront
 	PPanCoverBack = PanCoverBack
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear_last_worn':

locations/soniahome.qsrc

@@ -612,6 +612,7 @@ if $ARGS[0] = 'sonia_chat1':
 				gs 'arousal', 'foreplay', 1, 'lesbian'
 				gs 'stat'
 				act 'Stop kissing and talk more': gt 'soniahome', 'sonia_chat1'
+				act 'Make out':
 					*clr & cla
 					'<center><h4><font color="maroon">Sonia''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/home/bed_kiss.jpg"></center>'
@@ -693,7 +694,7 @@ if $ARGS[0] = 'boyfriend_chat':
 	if artemQW['bf'] = 1:
 		act 'Artem':
 			cla
-			if grupTipe3:
+			if grupTipe = 3:
 				'"Artem." you tell her.'
 				'She grins. "Well, you guys make a cute couple." she says with a giggle.'
 				'You sigh as those in love sigh. "He''s sweet and really nice to me."'

locations/underwear_bodysuits.qsrc

@@ -230,6 +230,19 @@ if $ARGS[0] = 'dispose':
 	bodysuitwornnumber = 0
 	$pantyworntype = 'none'
 	$braworntype = 'none'
+
+	PBraQuality = 0
+	PBraMaterial = 0
+	PBraType = 0
+	PBraFun = 0
+	PPanThinness = 0
+	PBraThinness = 0
+	PPanCoverFront = 4
+	PPanCoverBack = 4
+	PBraCover = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'remove':
@@ -240,6 +253,19 @@ if $ARGS[0] = 'remove':
 	underwear['lastworntype'] = 2
 	$pantyworntype = 'none'
 	$braworntype = 'none'
+
+	PBraQuality = 0
+	PBraMaterial = 0
+	PBraType = 0
+	PBraFun = 0
+	PPanThinness = 0
+	PBraThinness = 0
+	PPanCoverFront = 4
+	PPanCoverBack = 4
+	PBraCover = 4
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear':
@@ -298,6 +324,9 @@ if $ARGS[0] = 'wear2':
 	PPanCoverFront = PanCoverFront
 	PPanCoverBack = PanCoverBack
 	PBraCover = BraCover
+
+	gs 'clothing', 'exposure_calc'
+
 end
 
 if $ARGS[0] = 'wear_last_worn':