Merge branch 'master' of http://git.tfgamessite.com/KevinSmarts/girllife-ecv into release

locations/Gadhouse

@@ -192,52 +192,48 @@ if $ARGS[0] = 'Main':
 		if staygad ! daystart: gs 'gadukino_event', 'go_home'
 	end		
 	
-	!I am not sure, does anyone really making tissue for money? anyway, copy it here. by illume
-	!{
-	if gobelen > 0:'<<gobelen>> pieces of finished tapestry hangs on the wall.'
-	if pcs_sewng >= 50 and tkan > 0:'There is enough fabric for <<tkan>> lessons.'
-	if pcs_sewng >= 50 and tkan <= 0:'You can''t find any fabric.'
-	if pcs_sewng >= 200:
+	if gobelen>0:'You have <<gobelen>> completed tapestries.'
+	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
+	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
+	if pcs_sewng >= 80:
 		if newgobelen = 0 and tkan > 0:
-			act'Start on a new tapestry (0:15)':
-			cls
-			tkan -= 1
-			newgobelen = 1
-			minut += 15
-			gs'stat'
-			'The following 15 minutes you manage to pick out the fabric to use and prepare the outline of the pattern to embroider.'
-			act'Postpone': gt $curloc
+			act'Start a new tapestry':
+				cls
+				tkan -= 1
+				newgobelen = 1
+				minut += 15
+				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 gt 'Gadhouse', 'Main'
 			end
 		end
-		if newgobelen>=1:
-		'The tapestry is <<newgobelen/10>> percent complete.'
-			act'Continue embroidering for an hour (1:00)':
-			cls
-			minut += 60
-			sewng_exp += rand(0,1000)
-			gobramax = pcs_sewng/100
-			gobramin = pcs_sewng/200
-			newgobelen += rand(gobramin,gobramax)
-			gs'stat'
-			if newgobelen<1000:'You continue working on the tapestry for the next hour. You are <<newgobelen/10>> percent done.'
-				if newgobelen>=1000:
-				newgobelen=0
-				gobelen+=1
-				'You''ve finished the tapestry. It looks really nice.'
+		if newgobelen >= 1:
+			'Your tapestry is <<newgobelen/10>> percent finished.'
+			act'Work on the tapestry for an hour':
+				cls
+				minut += 60
+				sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+				gobramax = (pcs_sewng - 70) * 6
+				gobramin = (pcs_sewng - 70) * 2
+				newgobelen += rand(gobramin,gobramax)
+				gs'stat'
+				if newgobelen < 1000:'You spent 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'Postpone':gt $curloc
+				act'Set the tapestry aside':gt 'Gadhouse', 'Main'
 			end
 		end
 	end
-	}
-	!125e
 
 	act 'Go outside':
 		if $clothingworntype ! 'nude':
 			minut += 5 & gt 'Gaddvor'
 		else
 			msg'<b><font color = red>You can''t leave the house naked! You need to get dressed first.</font></b>'
-			gt $curloc
+			gt 'Gadhouse', 'Main'
 		end
 	end
 
@@ -262,7 +258,7 @@ if $ARGS[0] = 'Main':
 
 		gs 'stat'
 
-		act 'Get up from the table':gt 'Gadhouse', 'Start'
+		act 'Get up from the table':gt 'Gadhouse', 'Main'
 	end
 
 	if pranik > 0:
@@ -286,7 +282,7 @@ if $ARGS[0] = 'Main':
 			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 			'You enjoy a cup of tea while you eat some of the cookies. They''re too sweet and can''t be good for your figure, but they taste so good!'
 
-			act 'Get up from the table':gt 'Gadhouse', 'Start'
+			act 'Get up from the table':gt 'Gadhouse', 'Main'
 		end
 	end
 
@@ -320,7 +316,7 @@ if $ARGS[0] = 'Main':
 				'You make a cup of tea, quenching your thirst.'
 			end
 
-			act 'Get up from the table':gt 'Gadhouse', 'Start'
+			act 'Get up from the table':gt 'Gadhouse', 'Main'
 		end
 	end
 
@@ -343,7 +339,7 @@ if $ARGS[0] = 'Main':
 				'<center><img <<$set_imgh>> src="images/locations/shared/apartment/event/sick/lekr<<picrand>>.jpg"></center>'
 				'You swallow the pill, and shortly after you feel a bit better.'
 
-				act 'Continue':gt 'Gadhouse', 'Start'
+				act 'Continue':gt 'Gadhouse', 'Main'
 			end
 		end
 	end
@@ -371,7 +367,7 @@ if $ARGS[0] = 'Main':
 
 				'You swallow a vitamin pill to stay healthy.'
 
-				act 'Continue':gt 'Gadhouse', 'Start'
+				act 'Continue':gt 'Gadhouse', 'Main'
 			end
 		end
 	end

locations/HotelWork

@@ -17,11 +17,11 @@ if $ARGS[0] = 'maid':
 		act'Continue':gt 'hotelhole'
 	end
 
-	if hour<19:
+	if hour < 19:
 		act'Enter the room':
 			cla
 			*clr
-			pcs_mood -= 10
+			pcs_mood -= 3
 			
 			gs'stat'
 			

locations/VoltrenerSexShower

@@ -198,7 +198,7 @@ if $ARGS[0] = '5':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower19.jpg"></center>'
 		'Through the glass you see, as Michael strong views approaching the booth, and Vanya nothing, not seeing, pulls your ass, you frantically try to close the booth door on the lock, that Ivan looks like and not closed. But the cock in her ass and pushes Ivan not let you do it, the door abruptly opens, coach growled: "Again fuck. Prokhorov will tell your coach, you honouring mode, and the competitions are preparing". From these words Ivan shrank his penis opal and easily fell out of your ass: "Don''t need Michael to say anything to anyone, please. I will help with the hall, well, there is a grid to hang, girls to hold after departure", - and he, sideways covering his dignity, grabbing your stuff, got out of the shower.'
-		if pcs_horny < 80:
+		if pcs_horny < 65:
 			act 'Close the shower door':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower21.jpg"></center>'

locations/anushapt

@@ -503,6 +503,12 @@ if $ARGS[0] = 'computer':
 				end
 			end
 		end
+	else
+		*clr & cla
+		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
+		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/laptop.jpg"></center>'
+		'You''re not sure you should be using her computer when Anushka isn''t here without her permission so you decide better of it'
+		act 'Return': gt 'anushapt','anushroom'
 	end
 end
 
@@ -596,7 +602,7 @@ if $ARGS[0] = 'chat':
 				Anush_dolls = 2
 				'You tell her you''ve been there before and she says, "Next time you''re there tell them they owe me a round."'
 			end
-		!!Lillian-A flag probably needs to be set here to link together with Savva/Viola at the shop
+	!!Lillian-A flag probably needs to be set here to link together with Savva/Viola at the shop
 			act 'Keep talking': gt 'anushapt', 'chat'
 			act 'Stop talking': gt 'anushapt', 'anushroom'
 		end
@@ -711,7 +717,7 @@ if $ARGS[0] = 'chat':
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
 		'You know she is seeing some guys, it is not really a secret and some girls. Not sure if you should even ask but you are curious. "So do you have a boyfriend? Or girlfriend?"'
-		'Shaking her head no. "Nope, not really looking. I am young and carefree. I plan to as they say sow my wild oats while I can. I am not against the idea mind you, if that right person came along and just blew me away, then I would likely consider it anyways." She pauses a moment and then gives you a wicked grin. "Why do you ask? You wanting to fill that [i]slot?[/i]"'
+		'Shaking her head no. "Nope, not really looking. I am young and carefree. I plan to as they say sow my wild oats while I can. I am not against the idea mind you, if that right person came along and just blew me away, then I would likely consider it anyways." She pauses a moment and then gives you a wicked grin. "Why do you ask? You wanting to fill that <i>slot?</i>"'
 		'The way she says it, makes you blush a little. She leaves no doubt what slot she means and she makes it sound so dirty and exciting at the same time. But did you mean that?'
 		act 'Maybe':
 			cla
@@ -741,17 +747,20 @@ if $ARGS[0] = 'chat':
 			*clr
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
-!!can you make the <<boyfriend>> be the name of who ever Sveta is dating? Niko, Fedor, Artem, etc? I have no clue how hard that would be to code but eventually we will need a code like that, for the expanded chats with NPC''s at school, home and the disco.
-			'You tell her. "I have a boyfriend you know."'
-			'She grins at you. "Right who are you dating again?"'
-			'"<<boyfriend>>" You tell her.'
-			'"Really? Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
-!!if the boyfriend is Niko then this text appear instead of the above text.
-			'You tell her. "I have a boyfriend you know."'
-			'She grins at you. "Right who are you dating again?"'
-			'"<<boyfriend>>" You tell her.'
-			'Anushka looks at you a long moment like she is internally debating something. "Hey if you like him great, but... just be careful around him ok. He isn''t always what he seems."'
-			'Then she smiles and before you can ask what she meant by that she asks. "Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
+!!if the boyfriend is Niko
+			if NikoVolkovQW >= 5:
+				'You tell her. "I have a boyfriend you know."'
+				'She grins at you. "Right who are you dating again?"'
+				'"Niko" You tell her.'
+				'Anushka looks at you a long moment like she is internally debating something. "Hey if you like him great, but... just be careful around him ok. He isn''t always what he seems."'
+				'Then she smiles and before you can ask what she meant by that she asks. "Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
+			else
+!!can you make the <<boyfriend>> be the name of who ever Sveta is dating? Fedor, Artem, etc? I have no clue how hard that would be to code but eventually we will need a code like that, for the expanded chats with NPC''s at school, home and the disco.
+				'You tell her. "I have a boyfriend you know."'
+				'She grins at you. "Right who are you dating again?"'
+				'"<<boyfriend>>" You tell her.'
+				'"Really? Hmm think he would be up for a threesome?" She says as she makes a kissy face at you.'
+			end
 			act 'No':
 				cla
 				*clr
@@ -795,7 +804,7 @@ if $ARGS[0] = 'chat':
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/brtkiss.jpg"></center>'
 		'As you lay side by side you look at her for a moment, maybe too long, or maybe she just senses it. She turns her head to look at you, her face not far from yours and you can''t help it, you just think she is so damn pretty. You lean over and kiss her. She returns your kiss fully.'
 		gs 'arousal', 'foreplay', 10, 'lesbian'
-		act 'Stop kissing and talk more': gt 'anushapt', 'Chat'
+		act 'Stop kissing and talk more': gt 'anushapt', 'chat'
 		act 'Make out':
 			cla
 			*clr
@@ -808,7 +817,7 @@ if $ARGS[0] = 'chat':
 				*nl
 				npc_rel['A144'] -= 3
 				'You pull away before things go to far and catch your breath. You see her slightly confused look and you feel a bit bad. "Sorry, I got carried away. Can we just go back to talking?" She frown a little. "Yeah whatever." You know you annoyed her a little and you don''t blame her, you did just tease her more or less.'
-				act 'Talk about something else': gt 'anushapt', 'Chat'
+				act 'Talk about something else': gt 'anushapt', 'chat'
 			end
 			act 'Peeking':
 				cla

locations/bedrPar

@@ -170,8 +170,8 @@ if pcs_sewng >= 80:
 			cls
 			minut+=60
 			sewng_exp += rand(pcs_intel/10, pcs_intel/5)
-			gobramax = pcs_sewng / 50
-			gobramin = pcs_sewng / 100
+			gobramax = (pcs_sewng - 70) * 6
+			gobramin = (pcs_sewng - 70) * 2
 			newgobelen += rand(gobramin,gobramax)
 			gs'stat'
 			if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'

locations/boy_likes

@@ -415,7 +415,7 @@ if $ARGS[0] = 'clotTopPref':
 				loverrelation[lover_number] -= 2 
 				$meetTopPref = '<<$loverdesc[lover_number]>> looks at your cleavage and says he likes girls that wear clothes with <<$clotTopPref>> cleavage, and anything else is trash."'
 			end	
-		elseif PCloTopCut <= clotTopMax:
+		else
 			if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1
@@ -453,7 +453,7 @@ if $ARGS[0] = 'clotTopPref':
 				loverrelation[lover_number] -= 2 
 				$meetTopPref = '<<$loverdesc[lover_number]>> looks at your cleavage and says he likes girls that wear clothes with <<$clotTopPref>> cleavage, and anything else is trash."'
 			end	
-		elseif PCloTopCut <= clotTopMax and PCloTopCut >= clotTopMin:
+		else
 				if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1
@@ -479,7 +479,7 @@ if $ARGS[0] = 'clotTopPref':
 				loverrelation[lover_number] -= 2 
 				$meetTopPref = '<<$loverdesc[lover_number]>> looks at your cleavage and says he likes girls that wear clothes with <<$clotTopPref>> cleavage, and anything else is trash."'
 			end	
-		elseif PCloTopCut >= clotTopMin:
+		else
 			if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1
@@ -511,7 +511,7 @@ if $ARGS[0] = 'bottShorPref':
 				loverrelation[lover_number] -= 2 
 				$meetBottPref = '<<$loverdesc[lover_number]>> looks at your legs and says he likes girls that wear clothes with <<$bottShorPref>> bottoms, and yours makes you look like a slut."'
 			end	
-		elseif PCloSkirt <= bottShorMax or PCloPants <= bottShorMax:
+		else
 			if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1
@@ -550,7 +550,7 @@ if $ARGS[0] = 'bottShorPref':
 				loverrelation[lover_number] -= 2 
 				$meetBottPref = '<<$loverdesc[lover_number]>> looks at your legs and says he likes girls that wear clothes with <<$bottShorPref>> bottoms, and yours makes you look like a slut."'
 			end	
-		elseif (PCloSkirt <= bottShorMax or PCloPants <= bottShorMax) and (PCloSkirt >= bottShorMin or PCloPants >= bottShorMin):
+		else
 			if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1
@@ -576,7 +576,7 @@ if $ARGS[0] = 'bottShorPref':
 				loverrelation[lover_number] -= 2 
 				$meetBottPref = '<<$loverdesc[lover_number]>> looks at your legs and says he likes girls that wear clothes with <<$bottShorPref>> bottoms, and yours makes you look like a prude."'
 			end	
-		elseif PCloSkirt >= bottShorMin or PCloPants >= bottShorMin:
+		else
 			if haraklover[lover_number] = 0:
 
 				loverrelation[lover_number] += 1

locations/cuminsidereact

@@ -2,22 +2,12 @@
 
 argc = arrsize('$ARGS')
 
-if $risk_boy = '':
-	if argc > 0:
-		$risk_boy = $ARGS[0]
-	else
-		$risk_boy = ''
-	end
-end
-if argc > 1:
-	eff_contra = ARGS[1]
-else
-	eff_contra = sexcontra
-end
-
-tmp = func 'pregriskeval'
+if $risk_boy = '': $risk_boy = $ARGS[0]
+eff_contra = iif(argc > 1,ARGS[1],sexcontra)
 
 if eff_contra ! 3:
+	tmp = func('pregriskeval',eff_contra)
+
 	if succubusflag = 1:
 		'You think to yourself, "This should be Yummy!"'
 	elseif tmp = -4:
@@ -48,9 +38,8 @@ if eff_contra ! 3:
 		end
 	end
 end
-
-cuminside = 0
-$risk_boy = ''
-
+killvar 'tmp'
+killvar 'cuminside'
+killvar '$risk_boy'
 --- cuminsidereact ---------------------------------
 

locations/dinSex

@@ -1242,7 +1242,9 @@ $analsexrude = {
 	gs 'Cum_Manage'
 	'Through some time <<$boydesc>> groaned and you feel like your ass fills a pleasant warmth.'
 }
+
 ! "deal_with_condom" procedure should be replacement of "sexstart" dynamic procedure
+!! gs 'dinsex', 'boy_puts_condom'
 if $ARGS[0] = 'boy_puts_condom':
 	protect = iif(prezik > 0,1,0)
 	vidageday -= 1 &! the people guess that you are a bit more older than you are in fact
@@ -1256,7 +1258,6 @@ if $ARGS[0] = 'boy_puts_condom':
 		else
 			sexcontra = 3
 			*p '<<ucase(mid($boydesc,1,1))>><<mid($boydesc,2,len($boydesc)-1)>> takes your condom and puts it on <<$xem>> <<dick>> centimeter member.'
-			end
 			noprotect = 0
 		end
 		prezik -= 1
@@ -1267,6 +1268,7 @@ if $ARGS[0] = 'boy_puts_condom':
 	end
 end &! --- boy_puts_condom ---
 
+!! gs 'dinsex', 'boy_puts_his_condom'
 if $ARGS[0] = 'boy_puts_his_condom':
 	protect = 1
 	sexcontra = 3
@@ -1274,6 +1276,7 @@ if $ARGS[0] = 'boy_puts_his_condom':
 	!! the hormonal contraception is still taken in account
 end &! --- boy_puts_his_condom ---
 
+!! gs 'dinsex', 'pc_puts_condom'
 if $ARGS[0] = 'pc_puts_condom':
 	protect = iif(prezik > 0,1,0)
 	vidageday -= 1 &! the people guess that you are a bit more older than you are in fact
@@ -1297,6 +1300,7 @@ if $ARGS[0] = 'pc_puts_condom':
 	end
 end &! --- pc_puts_condom ---
 
+!! gs 'dinsex', 'boy_wants_anal'
 if $ARGS[0] = 'boy_wants_anal':
 	$bwa_boy = iif($ARGS[1] = '',$boydesc,$ARGS[1])
 	if analplugin = 1:
@@ -1319,6 +1323,7 @@ if $ARGS[0] = 'boy_wants_anal':
 	killvar '$bwa_boy'
 end &! --- boy_wants_anal ---
 
+!! gs 'dinsex', 'girl_wants_anal'
 if $ARGS[0] = 'girl_wants_anal':
 	$bwa_girl = iif($ARGS[1] = '',$boydesc,$ARGS[1])
 	if analplugin = 1:
@@ -1342,6 +1347,7 @@ if $ARGS[0] = 'girl_wants_anal':
 	killvar '$bwa_girl'
 end &! --- girl_wants_anal ---
 
+!! gs 'dinsex', 'after_anal','boy',$boydesc
 if $ARGS[0] = 'after_anal':
 	if analplugout = 1:
 		if $ARGS[1] = 'boy':
@@ -1364,31 +1370,97 @@ if $ARGS[0] = 'after_anal':
 	end
 end &! --- after_anal ---
 
-!! sexstart2 replacement - this procedure calls 'arousal','vaginal', but the rest of the parameters, has to be passed in parameter so call like gs 'dinsex','vaginal_sex',',10,''rough'',''sub'''
+!! replacement of  "dynamic $sexstart2"
+!! this procedure calls 'arousal','vaginal', but the rest of the parameters, has to be passed in parameter so call like gs 'dinsex','vaginal_sex',',10,''rough'',''sub'' '
 if $ARGS[0] = 'vaginal_sex':
 	frost = 0 &! the sex heats
 	if pcs_vag > 0:
-		dyneval( 'gs ''arousal'',''vaginal''<<$ARGS[1]>>')
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		if (vgrdif + vltdif) >= 30: 'You groaned in pain when <<$boydesc>> penetrated, tears flowed from your eyes and it feels like someone drove a red-hot rod in your vagina. You cry and moan while <<$xem>> strong <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
 		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when <<$boydesc>> entered, it is very painful. You are frowning and moaning in pain while <<$xem>> strong <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
-		$temp_mens = ' even though' + $temp_mens
+		if cycle <= 0: $temp_mens = ' even though' + $temp_mens
 		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You winced at the sudden pain when <<$boydesc>> entered, it hurted but it gradually become quite tolerable. You are trying to get aroused while <<$xem>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>, but you did not succeed.'
 		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You are startled by feeling that your pussy is stretching when <<$boydesc>> entered you. It feels good when <<$xem>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
 		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You are startled by feeling that your pussy is stretching as <<$boydesc>> entered you. It feels good when <<$xem>> strong <<dick>> centimeter dick fucks your pussy. Gradually a pleasant warmth and pulsations is increasing in the abdomen, then the feeling decreases a little and remained until the end<<$temp_mens>>.'
 		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You flinched from a pleasant feeling when your pussy is stretched by <<$xem>> dick. It feels good when <<$xem>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.Gradually a pleasant warmth and pulsations is increasing in the lower abdomen,the feeling then descend and your entire body covered with hot waves of orgasm, you scream with pleasure.'
 		if (vgrdif + vltdif) <  -3: 'You feel as <<$xem>> penis enters your pussy. You feel nice between your legs , but <<$xem>> <<dick>> cm dick is significantly less than your pussy and not enough for you. Gradually a pleasant warmth and pulsations is increasing in the abdomen, then the feeling a decreases a little and remained until the end<<$temp_mens>>.'
+		dynamic( 'gs ''arousal'',''vaginal''<<$ARGS[1]>>')
 	else
-		dyneval( 'gs ''arousal'',''vaginal'',<<$ARGS[1]>>')
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		pcs_horny = 0
 		pcs_mood -= 15
 		pcs_willpwr -= 15
 		'You have bitten your <<$liptalk>> in pain and tears started to flow from your eyes when <<$boydesc>> entered, breaking your hymen. You moan while crying and <<$xem>> <<dick>> centimeter dick fucks your bloody pussy.'
+		dynamic( 'gs ''arousal'',''vaginal'',<<$ARGS[1]>>')
 	end
 	killvar '$temp_mens'
 end
 
+!! replacement of "dynamic $analsex"
+!! this procedure calls 'cum_call','anus',$boy,1
+!! use gs 'dinsex','analsex'
+if $ARGS[0] = 'analsex':
+	frost = 0 &! the sex heats
+	if pcs_ass < 10:'<<$xec>> inserted three fingers into your ass and you groaned in pain.'
+	if pcs_ass >= 10:'<<$xec>> started to stretch your anus with three fingers.'
+	'<<$boydesc>> pulled <<$xem>> fingers out of your ass and you felt <<$xem>> hard cock near your hole.'
+	if (agrdif + altdif) >= 20:'You screamed and bit your lip from a sharp pain when <<$xem>> <<dick>> centimeter dick entered your ass.'
+	if (agrdif + altdif) <  20:'You moaned when <<$xem>> <<dick>> centimeter dick entered your ass.'
+	'<<$boydesc>> stopped for a moment, giving your ass time to adjust to <<$xem>> cock in it, and then started to slowly move, stretching your anus.'
+
+	if (agrdif + altdif) >= 30:
+		if pcs_makeup > 1:pcs_makeup = 0
+		'You cried and bit your lip when <<dick>> centimeter cock began to fuck your ass on (! full force !). Your ass felt like it was on fire and all you wanted was that this torture was over quickly.'
+	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+		pcs_horny += 10
+		'You started to moan rhythmically in time with <<$xem>> cock''s movements inside you. You feel like your anus is stretched when <<$xem>> penis enters you.'
+	end
+	dynamic( 'gs ''arousal'',''anal''<<$ARGS[1]>>')
+	'Through some time <<$boydesc>> groaned and you feel like your ass fills a pleasant warmth.'
+	gs 'cum_call','anus',$boy,1
+end &! --- analsex ---
+
+!! replacement of "dynamic $sexcum"
+!! this procedure calls 'cum_call','',$boy,1
+!! use gs 'dinsex','sexcum'
+if $ARGS[0] = 'sexcum':
+	frost = 0
+	if protect ! 1:
+		!!Unprotected sex
+		if rand(0, 1) = 0:
+			cumvag_text = RAND(0,2)
+			if cumvag_text = 0: '<<$xemc>> movements speed up and <<$xe>> drives <<$xem>> cock balls deep into you with a beatific smile, <<$xe>> cums deep inside you. You feel a warm jet pour into your womb.'
+			if cumvag_text = 1: '<<$xec>> does not pull out and instead pulls you tightly against <<$xyr>> and your pussy is filled with splashes of semen.'
+			if cumvag_text = 2: '<<$xec>> groans, and you feel a jet of sperm hit you inside your body.'
+			gs 'cuminsidereact', $boydesc
+		else
+			!!Out
+			if pose = 0:
+				spafinloc = 14
+				'<<$boydesc>> groaned and after pulling out <<$xem>> dick, <<$xe>> came on your stomach.'
+				gs 'cum_call','stomach',$boy,1
+			elseif pose = 1:
+				'<<$boydesc>> groaned and after pulling out <<$xem>> dick, <<$xe>> came on your ass.'
+				gs 'cum_call','butt',$boy,1
+			end
+		end
+	else
+		$tmp = iif(sexcontra = 7,'sabotaged ','')
+		'<<$boydesc>> groaned and you realized that <<$xe>> had came in the <<$tmp>>condom.'
+		if sexcontra = 4:
+			'Pulling out of you and looking at <<$xem>> dick, <<$boydesc>> said "Hmm, the condom burst."'
+		elseif sexcontra = 5:
+			'Pulling out of you and looking at <<$xem>> dick, <<$boydesc>> said "Hmm, the condom is missing."'
+		end
+		eff_contra = sexcontra
+		gs 'cum_call','',$boy,1
+		
+		gs 'cuminsidereact',$boydesc, eff_contra
+		protect = 0
+	end
+	pose = 0
+	killvar 'eff_contra'
+end &! --- sexcum ---
 
 --- dinSex ---------------------------------
 

locations/din_van

@@ -888,12 +888,14 @@ if $ARGS[0] = 'private':
         end
     end
 
-    if mosolmaz > 0 and mosol > 0:
+    if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
         act 'Rub ointment onto your pussy (0:05)':
             cla
+			mosal_time = (daystart * 100) + hour
             minut += 5
             mosolmaz -= 1
             mosol -= 5
+			if pain['pubic'] > 3: pain['pubic'] -= 3
             'You take a tube of cream and rub it onto your itchy vulva.'
 
             act 'Finish':gt $locM, $metkaM

locations/event

@@ -735,7 +735,7 @@ end
 if $ARGS[0] = 'dima47':
 	cls
 	pcs_throat += 5
-	i = 0
+	dimagh_counter = 0
 	:gloryhole1
 	gs 'npcgeneratec', 0, 'stranger', rand(19,45)
 	gs 'boyStat', $npclastgenerated
@@ -743,8 +743,8 @@ if $ARGS[0] = 'dima47':
 	gs 'cum_manage'
 	swallow += 1
 	gloryhole += 1
-	i += 1
-	if i <= 8:jump 'gloryhole1'
+	dimagh_counter += 1
+	if dimagh_counter <= 8:jump 'gloryhole1'
 	pcs_vag += 1
 	gs 'boyStat', 'A170'
 	gs 'cum_manage'
@@ -767,13 +767,14 @@ if $ARGS[0] = 'dima47':
 	minut -= 50
 	gs 'arousal', 'end'
 	gs 'stat'
+	killvar 'dimagh_counter'
 	act 'Get Outside' :gt 'nord'
 end
 
 if $ARGS[0] = 'dima48':
 	cls
 	pcs_throat += 5
-	i = 0
+	dimagh_counter = 0
 	:gloryhole2
 	gs 'npcgeneratec', 0, 'stranger', rand(19,45)
 	gs 'boyStat', $npclastgenerated
@@ -781,8 +782,8 @@ if $ARGS[0] = 'dima48':
 	gs 'cum_manage'
 	swallow += 1
 	gloryhole += 1
-	i += 1
-	if i <= 8:jump 'gloryhole2'
+	dimagh_counter += 1
+	if dimagh_counter <= 8:jump 'gloryhole2'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/15933_markdavisdonnaannika_481.jpg"></center>'
 	'It looks like you misunderstood the girl.'
@@ -794,6 +795,7 @@ if $ARGS[0] = 'dima48':
 	gs 'arousal', 'bj', 50, 'sub', 'prostitution', 'rough', 'deepthroat'
 	gs 'arousal', 'end'
 	gs 'stat'
+	killvar 'dimagh_counter'
 	act 'Get Outside' :gt 'nord'
 end
 
@@ -957,10 +959,10 @@ if $ARGS[0] = 'lesbi3':
 	'You are suddenly interested, how do you control other girls like this? Maybe you''ll ask this woman to teach you.'
 	'Then you can find yourself a very docile simpleton and make her do your chores and save you having to put up with so many dumb guys.'
 	'Having deciding you asked, "Can you teach me that?"'
-	'"Teach?" She asked in surprise. "Teach .. hmm .. I think I might be able to help you! - The lady says with a grin. - Come visit me at my apartment.'
+	'"Teach?" She asked in surprise. "Teach .. hmm .. I think I might be able to help you!" The lady says with a grin. "Come visit me at my apartment."'
 	'You read the card and see that see lives in the city residential area, looking up again, Natalya is walking out of the boutique with a graceful and confident gait.'
 
-	act 'Leave':gt 'park', 'start'
+	act 'Leave':gt 'butik', 'start'
 end
 
 --- event ---------------------------------

locations/exercise

@@ -227,10 +227,10 @@ if $ARGS[0] = 'setup':
 	*nl
 	*nl
 	'<center><table><TH></TH><TH></TH><TH>Push ups</TH><TH>Crunches</TH><TH>Jump rope</TH><TH>Yoga</TH><TH>Hula hoop</TH>'
-	'<TR><TD><<$excer_name[1]>></TD><TD><a href="exec:$excer_name[1] = input (''Enter name for exercise routine 1'')">rename</a></TD><TD><<exer_rout0[1]*15>> minutes</TD><TD><<exer_rout1[1]*15>> minutes</TD><TD><<exer_rout2[1]*15>> minutes</TD><TD><<exer_rout3[1]*15>> minutes</TD><TD><<exer_rout4[1]*15>> minutes</TD>'
-	'<TR><TD><<$excer_name[2]>></TD><TD><a href="exec:$excer_name[2] = input (''Enter name for exercise routine 2'')">rename</a></TD><TD><<exer_rout0[2]*15>> minutes</TD><TD><<exer_rout1[2]*15>> minutes</TD><TD><<exer_rout2[2]*15>> minutes</TD><TD><<exer_rout3[2]*15>> minutes</TD><TD><<exer_rout4[2]*15>> minutes</TD>'
-	'<TR><TD><<$excer_name[3]>></TD><TD><a href="exec:$excer_name[3] = input (''Enter name for exercise routine 3'')">rename</a></TD><TD><<exer_rout0[3]*15>> minutes</TD><TD><<exer_rout1[3]*15>> minutes</TD><TD><<exer_rout2[3]*15>> minutes</TD><TD><<exer_rout3[3]*15>> minutes</TD><TD><<exer_rout4[3]*15>> minutes</TD>'
-	'<TR><TD><<$excer_name[4]>></TD><TD><a href="exec:$excer_name[4] = input (''Enter name for exercise routine 4'')">rename</a></TD><TD><<exer_rout0[4]*15>> minutes</TD><TD><<exer_rout1[4]*15>> minutes</TD><TD><<exer_rout2[4]*15>> minutes</TD><TD><<exer_rout3[4]*15>> minutes</TD><TD><<exer_rout4[4]*15>> minutes</TD>'
+	'<TR><TD><<$excer_name[1]>></TD><TD><a href="exec:$excer_name[1] = input (''Enter name for exercise routine 1'') & gt ''exercise'', ''blank''">rename</a></TD><TD><<exer_rout0[1]*15>> minutes</TD><TD><<exer_rout1[1]*15>> minutes</TD><TD><<exer_rout2[1]*15>> minutes</TD><TD><<exer_rout3[1]*15>> minutes</TD><TD><<exer_rout4[1]*15>> minutes</TD>'
+	'<TR><TD><<$excer_name[2]>></TD><TD><a href="exec:$excer_name[2] = input (''Enter name for exercise routine 2'') & gt ''exercise'', ''blank''">rename</a></TD><TD><<exer_rout0[2]*15>> minutes</TD><TD><<exer_rout1[2]*15>> minutes</TD><TD><<exer_rout2[2]*15>> minutes</TD><TD><<exer_rout3[2]*15>> minutes</TD><TD><<exer_rout4[2]*15>> minutes</TD>'
+	'<TR><TD><<$excer_name[3]>></TD><TD><a href="exec:$excer_name[3] = input (''Enter name for exercise routine 3'') & gt ''exercise'', ''blank''">rename</a></TD><TD><<exer_rout0[3]*15>> minutes</TD><TD><<exer_rout1[3]*15>> minutes</TD><TD><<exer_rout2[3]*15>> minutes</TD><TD><<exer_rout3[3]*15>> minutes</TD><TD><<exer_rout4[3]*15>> minutes</TD>'
+	'<TR><TD><<$excer_name[4]>></TD><TD><a href="exec:$excer_name[4] = input (''Enter name for exercise routine 4'') & gt ''exercise'', ''blank''">rename</a></TD><TD><<exer_rout0[4]*15>> minutes</TD><TD><<exer_rout1[4]*15>> minutes</TD><TD><<exer_rout2[4]*15>> minutes</TD><TD><<exer_rout3[4]*15>> minutes</TD><TD><<exer_rout4[4]*15>> minutes</TD>'
 	'</table></center>'
 
 	act 'Return': gt 'exercise', 'workout'
@@ -241,6 +241,12 @@ if $ARGS[0] = 'setup':
 !!exer_rout1 = default
 end
 
+if $ARGS[0] = 'blank':
+	cla
+	*clr
+	act 'Return': gt 'exercise', 'setup'
+end
+
 if $ARGS[0] = 'matrix':
 	*clr
 	cla
@@ -339,6 +345,8 @@ if $ARGS[0] = 'hula':
 		else
 			'<center><img <<$set_imgh>> src="images/pc/activities/huladressed.gif"></center>'
 		end
+	elseif tanga = 1:
+		'<center><img <<$set_imgh>> src="images/pc/activities/hula_underwear.gif"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/pc/activities/obruch.gif"></center>'
 	end
@@ -370,7 +378,7 @@ if $ARGS[0] = 'yoga':
 	elseif tanga = 1:
 		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_underwear.gif"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_nude.gif"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_naked.gif"></center>'
 	end
 
 	'You meditate for <<$timestring>> minutes, developing your will.'

locations/fit

@@ -247,8 +247,8 @@ if $ARGS[0] = 'gym':
 	'In the fitness center there are a lot of different classes and clubs, designed to improve physical development.'
 
 	if StoryLine = 1:
-		if hour >= 10 and hour < 12 and week=7 and centr=1: 'In the hall you saw  <a href="exec:GT ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
-		if hour >= 10 and hour < 12 and week=7 and centr=2: 'In the hall you saw  <a href="exec:GT ''VolleyTrenCentr''">Chinese Guanggu</a>'
+		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:GT ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
+		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:GT ''VolleyTrenCentr''">Guang</a>'
 	end
 
 	gs 'fit', 'exercise end'

locations/foto

@@ -155,7 +155,7 @@ if $ARGS[0] = 'studio':
 											if panties = 1:tanga = 1
 											gs 'stat'
 											'Well that''s a shame. Come back if you change your mind.'
-											act 'Leave'gt: 'down'
+											act 'Leave': gt 'down'
 										end
 									end
 								end
@@ -194,7 +194,7 @@ if $ARGS[0] = 'studio':
 												if panties = 1:tanga = 1
 												gs 'stat'
 												'Well that''s a shame. Come back if you change your mind.'
-												act 'Leave'gt: 'down'
+												act 'Leave': gt 'down'
 											end
 										end
 									end
@@ -242,7 +242,7 @@ if $ARGS[0] = 'studio':
 												if panties = 1:tanga = 1
 												gs 'stat'
 												'Well that''s a shame. Come back if you change your mind.'
-												act 'Leave'gt: 'down'
+												act 'Leave': gt 'down'
 											end
 										end
 									end
@@ -282,7 +282,7 @@ if $ARGS[0] = 'studio':
 													gs 'stat'
 													'Well that''s a shame. Come back if you change your mind.'
 													'You get dressed and leave.'
-													act 'Leave'gt: 'down'
+													act 'Leave': gt 'down'
 												end
 											end
 										end
@@ -926,11 +926,7 @@ if $ARGS[0] = 'practicemodel':
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
 
-							if pcs_mdlng >= 40 and commercial = 0:
-								act 'Leave':gt'foto','commercial'
-							else
-								act 'Leave':gt 'foto', 'end'
-							end
+							act 'Leave':gt 'foto', 'end'
 						end
 					end
 				else
@@ -940,11 +936,7 @@ if $ARGS[0] = 'practicemodel':
 						'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 						'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
 
-						if pcs_mdlng >= 40 and commercial = 0:
-							act 'Leave':gt'foto','commercial'
-						else
-							act 'Leave':gt 'foto', 'end'
-						end
+						act 'Leave':gt 'foto', 'end'
 					end
 				end
 			end
@@ -977,11 +969,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -991,11 +979,7 @@ if $ARGS[0] = 'practicemodel':
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
 
-							if pcs_mdlng >= 40 and commercial = 0:
-								act 'Leave':gt'foto','commercial'
-							else
-								act 'Leave':gt 'foto', 'end'
-							end
+							act 'Leave':gt 'foto', 'end'
 						end
 					end
 				end
@@ -1021,11 +1005,7 @@ if $ARGS[0] = 'practicemodel':
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
 
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1035,11 +1015,7 @@ if $ARGS[0] = 'practicemodel':
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
 
-							if pcs_mdlng >= 40 and commercial = 0:
-								act 'Leave':gt'foto','commercial'
-							else
-								act 'Leave':gt 'foto', 'end'
-							end
+							act 'Leave':gt 'foto', 'end'
 						end
 					end
 				end
@@ -1071,11 +1047,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1112,16 +1084,12 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
 						act'. . .':
-							cla
+							cla & *clr
 							*nl
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
@@ -1161,11 +1129,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1202,11 +1166,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1254,11 +1214,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1295,11 +1251,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1341,15 +1293,11 @@ if $ARGS[0] = 'practicemodel':
 							'You keep your crotch covered with your hands or props during the shoot. The urge to use them to cover up completely is almost irresistable but you have to power through this if you want to do this kind of work. You must be bold!'
 							'That being said, you''re having a difficult time of it and you can tell you aren''t doing a very good job.'
 							act'. . .':
-							*clr & cla
-							*nl
-							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
-							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								*clr & cla
+								*nl
+								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
+								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1386,11 +1334,7 @@ if $ARGS[0] = 'practicemodel':
 							*nl
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1437,11 +1381,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1479,11 +1419,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1529,11 +1465,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1570,11 +1502,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1619,11 +1547,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1660,11 +1584,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								'<center><img src="images/locations/city/citycenter/photo/modelbts2.gif"></center>'
-								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
-								else
-									act 'Leave':gt 'foto', 'end'
-								end
+								act 'Leave':gt 'foto', 'end'
 							end
 						end
 					else
@@ -1721,11 +1641,7 @@ if $ARGS[0] = 'model':
 			'<center><img src="images/locations/city/citycenter/photo/fashion.gif"></center>'
 			'You dress up in the latest in fashion wear and spend the next three hours posing for the photographer.'
 			'Finally having taken all his pictures, the photographer thanks you for your time, counts out your <<modelpayfin>> <b>₽</b>, and pays it to you.'
-			if pcs_mdlng >= 40 and commercial = 0:
-				act 'Leave':gt'foto','commercial'
-			else
-				act 'Leave':gt 'foto', 'end'
-			end
+			act 'Leave':gt 'foto', 'end'
 		end
 	end
 	
@@ -1750,11 +1666,7 @@ if $ARGS[0] = 'model':
 				'<center><img src="images/locations/city/citycenter/photo/model1.jpg"></center>'
 				'You dress up in sexy clothes and spend the next three hours posing for the photographer.'
 				'Finally having taken all his pictures, the photographer thanks you for your time, counts out your <<modelpayfin>> <b>₽</b>, and pays it to you.'
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
+				act 'Leave':gt 'foto', 'end'
 			end
 		end
 	end
@@ -2074,7 +1986,7 @@ if $ARGS[0] = 'commercial':
 							cla
 							*nl
 							'"No," you say with some regret. "Even with all that money, that''s not the kind of model or actress I want to be known for."'
-							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<pcs_firstname>>"'
+							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<$pcs_firstname>>"'
 							act 'Go back to modelling':gt 'foto', 'studio'
 						end
 					end

locations/gLakeNude

@@ -152,7 +152,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 				minut = minut + 60
 				if pcs_sweat < 35 : pcs_sweat += 5
 				pcs_mood += 5
-				if bikini = 1:
+				if $clothingworntype = 'swimwear':
 					'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'

locations/gdktoilet

@@ -857,7 +857,7 @@ if $ARGS[0] = 'blowjob':
 	'You wrap your lips around his dick and take his <<npc_dick[$npclastgenerated]>>cm long <<$npc_thdick[$npclastgenerated]>> cock in your mouth and start to suck it, you suck the cock enthusiastically.'
 	gs 'arousal', 'bj', 5, 'unknown', 'sub'
 	gs 'stat'
-	if pcs_vag > 0 or stat['anal'] > 0:act 'Undress':gt 'gdktoilet', 'ghsex'
+	if stat['vaginal'] > 0 or stat['anal'] > 0:act 'Undress':gt 'gdktoilet', 'ghsex'
 	act 'Continue to Suck':
 		cla
 		*clr
@@ -899,10 +899,10 @@ if $ARGS[0] = 'ghsex':
 	'You let go of him and quickly undress, once you are naked you start stroking him again while you line yourself up with his dick. You badly want to fuck him.'
 	gs 'arousal', 'hj', 5, 'unknown', 'sub'
 	gs 'stat'
-	if pcs_ass > 0:
+	if stat['anal'] > 0:
 		act 'Ass':gt 'gdktoilet', 'anal'
 	end
-	if pcs_vag > 0:
+	if stat['vaginal'] > 0:
 		act 'Pussy':gt 'gdktoilet', 'pussy2'
 	end
 end

locations/gschool_events

@@ -151,13 +151,13 @@ if $ARGS[0] = 'teacher_greet':
 				cla
 				*clr
 				if tanga = 1:
-					pcs_exhibition += 2
+					exhibition_exp += 2
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendover.jpg"></center>'
 					npc_rel['A26'] += 1
 					'You dropped some books and bend over at the waist to pick up the books, showing off your ass.'
 					'"<<$pcs_nickname>>, you should bend at the knees to squat down instead of bend over like that or one of the boys might take advantage." He said with a smile.'
 				else
-					pcs_exhibition += 3
+					exhibition_exp += 3
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendoverbare.jpg"></center>'
 					npc_rel['A26'] += 1
 					'You dropped some books and bend over at the waist to pick up the books, showing off your ass.'
@@ -175,13 +175,13 @@ if $ARGS[0] = 'teacher_greet':
 					cla
 					*clr
 					if tanga = 1:
-						pcs_exhibition += 2
+						exhibition_exp += 2
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendover.jpg"></center>'
 						'You don''t pay attention to the teachers words and decided to have fun a little more. Reaching for the next book, you inadvertently pull your skirt up, giving the teacher a full view of your panty clad ass.'
 						'"<<$pcs_lastname>>, cover up." the teacher rushed to you and pulled your skirt down, covering your ass.'
 						'"Anatoly Evgenievich, but it''s just us. I always feel safe when you are around." you replied, standing up.'
 					else
-						pcs_exhibition += 3
+						exhibition_exp += 3
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendoverbare.jpg"></center>'
 						'You don''t pay attention to the teachers words and decided to have fun a little more. Reaching for the next book, you inadvertently pull your skirt up, giving the teacher a full view of your pussy and ass.'
 						'"<<$pcs_lastname>>, cover up." the teacher noticed that you are not wearing any panties. He quickly runs up to you and pulls your skirt down, covering up your naked ass.'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'rand_gopnic':
 			*clr
 			cla
 			grupvalue[4] += 5
-			pcs_exhibition += 5
+			exhibition_exp += 5
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/buttflash.gif"></center>'
 			'You snort at him and then look at his friend before looking back at him, as you wiggle your middle finger at him. Flipping him off while pretending you are wiggling your finger for another reason. "If I needed something that small to satisfy my itch, I could just use this." His friends howl with laughter, while he fumes a little. Then you turn and walk away with a laugh, flashing them your butt as you do. Teasing them a bit on what they are missing out on.'
 		end
@@ -452,7 +452,7 @@ if $ARGS[0] = 'rand_scoolboy':
 			end
 			act 'Lift your skirt':
 				*clr & cla
-				pcs_exhibition += 5
+				exhibition_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy3.jpg"></center>'
 				'You think to yourself, "<<$rand_boy>> is actually kind of cute..."'
 				'You pretend the other boys aren''t there and sweetly ask him, "Come on <<$rand_boy>>, you know you only have to ask do you want to see more?" as you slowly begin to lift your skirt. That made him the hero of your class, and all the boys look at your body, and then at him in admiration. Then you drop your skirt back down and wave him off, "Just kidding, you pervert! Not with all these other guys around, anyway." and you give him a cute wink as you sit down and get ready for your next class. When you look back, you can see his face is all flustered.'
@@ -482,7 +482,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				grupvalue[2] -= 10
 				grupvalue[3] -= 10
 				pav_sex +=30
-				pcs_exhibition += 10
+				exhibition_exp += 10
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet1.jpg"></center>'
 				'You give him a sweet smile and take him by the hand, pulling him into the men''s room. Slightly lifting up your skirt, you put his hand between your legs. The other boys all follow the two of you, and now you''re being fondled in front of a crowd.'
 				act 'Take his cock out of his pants': gt 'gschool_sex', 'rand_bj'
@@ -830,8 +830,8 @@ if $ARGS[0] = 'disrupt':
 			'The guys decide not to argue with you and the lesson continues in silence. <<$teacher>> nods gratefully at you.'
 		else
 			'The guys laugh at your pitiful attempt to quiet them down and then ignore you. Your teacher can''t seem to get them to shut up either, and you don''t end up learning much as a result.'
-			act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 		end
+		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 	end
 	act 'Eavesdrop':
 		*clr
@@ -839,6 +839,7 @@ if $ARGS[0] = 'disrupt':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/urok<<urand>>.jpg"></center>'
 		'You''re curious about what your classmates are talking about, behind you. You can''t make out much of what they''re saying, but you do hear:'
 		gs 'gschool_events', 'gosip'
+
 		act 'Wait for the end of the lesson':gt 'gschool_lunch', 'lesson_end'
 	end
 
@@ -852,7 +853,7 @@ if $ARGS[0] = 'rand_class':
 		school_event_hour = 1
 		scooltiperand = RAND(1,21)
 		if scooltiperand  = 1 and Katja_tanga_end = 1 and tanga = 1:
-			pcs_exhibition += 3
+			exhibition_exp += 3
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 			'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
 		elseif scooltiperand = 2:
@@ -867,11 +868,11 @@ if $ARGS[0] = 'rand_class':
 			pcs_mood -= 10
 			gs'stat'
 			if tanga=1:
-				pcs_exhibition += 3
+				exhibition_exp += 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_1.jpg"></center>'
 				'When you walk up to the blackboard to answer a question, you trip and fall. Somehow you manage to fall in such a way that your skirt ends up on your back, while the whole class can see your panty-clad ass. You quickly get up and straighten your clothes with a bright red face, trying to ignore the hollering from your classmates. You can tell that most of the guys and even a few girls definitely appreciated your show, even if it was involuntarily.'
 			else
-				pcs_exhibition += 5
+				exhibition_exp += 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question your teacher poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with, and totally forgot you are not wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass, and both of your holes are on display for everyone to see. Everyone but the teacher, who has no clue why your class is so riled up and desperately tries to calm them down.'
 			end
@@ -992,7 +993,7 @@ if $ARGS[0] = 'rand_class':
 					'You bite your lip to silence the moan that wants to escape as you feel your molesters fingers give your nipple a quick pinch before retreating. After the hand is gone, you move your hand to the opposite side of your face, as if to scratch an itch and simultaneously glance over your shoulder until your eye is on <<$rand_boy>> who groped you. You give him a smile out of the corner of your mouth and use your index finger make a "Come here!" motion at him as you wink and scoot your chair back a few inches. His eyes fill with surprise and excitement and a few seconds after you turn back to face the teacher you feel his hand massaging your breast again.'
 					act 'Enjoy more':
 						cla
-						pcs_exhibition += 2
+						exhibition_exp += 2
 						'You spend the rest of class with <<$rand_boy>>''s hand coming and going to squeeze your breast and tweak your nipple, still careful to make sure the teacher doesn''t catch on.'
 						if tanga = 1:
 							if pcs_exhibition < 35:exhibition_exp += rand(1,3)
@@ -1106,8 +1107,8 @@ if $ARGS[0] = 'rand_class':
 			'You and <<$npc_firstname[$static_num]>> sit next to each other during class. You spend much of the class talking quietly to each other, often getting looks from the teacher when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
 		elseif scooltiperand = 21:
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 0, 0
-			pcs_exhibition +=2
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
+			exhibition_exp +=2
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 			'The lesson takes a brief pause as one of the students asks <<$teacher>> a question about her paper. With nothing to do for the moment, you doodle lazily in the margin of your notebook.'
 			'When you look back up, you notice <<$rand_boy>> turning his head away. You don''t think much of it at first, until you catch him a second time. Was he looking at you, or just in your direction? Even the teacher walks by and pauses next to your desk for a moment before continuing on.'
 			'Class resumes, and things return to normal, but part-way through the lesson, you look to <<$rand_boy>> again, and find him staring at you. He''s clearly not trying to make eye contact, however, or he would have noticed you looking back at him.'
@@ -1119,8 +1120,8 @@ if $ARGS[0] = 'rand_class':
 			end
 			act 'You ignore it':
 				cla
-				pcs_exhibition +=3
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/shirtopen.jpg"></center>'
+				exhibition_exp +=3
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
 				'You let <<$rand_boy>> continue to gawk at you. You find yourself somewhat amused at how little it takes to completely enthrall some boys.'
 				act 'Wait for the end of the lesson': gt 'gschool_lunch', 'lesson_end'
 			end
@@ -1161,7 +1162,7 @@ if $ARGS[0] = 'fiz_rand':
 			*clr
 			cla
 			pcs_mood -= 10
-			pcs_exhibition +=3
+			exhibition_exp +=3
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizperand1.jpg"></center>'
 			'You''re not wearing panties, and while you''re doing your pullups your shorts slide down a little. Your pubic area is on display for the whole class now. It''s met with mixed responses: the guys are whistling and hollering, while most of the girls are staring you down disapprovingly. You quickly let go of the bar and pull your shorts back up, deeply embarrassed by the whole ordeal.'

locations/gschool_lessons

@@ -839,7 +839,7 @@ if $ARGS[0] = 'npc_data':
 !!npc_gender[i] - 0 - male, 1 - female stored since MGX
 !!npc_rel['A<<i>>'] - Starting relationship
 !!npcPol[i] - sex, 0 - male, 1 - female
-!!grupTipe[i] - social group, -1 - outcasts, 1 - nerds, 2 - jocks, 3 - cool kids, 4 - gopnik, 0 - teachers
+!!grupTipe[i] - social group
 !!1 - cool kids
 !!2 - jocks
 !!3 - nerds

locations/gschool_sex

@@ -438,7 +438,7 @@ if $ARGS[0] = 'rand_bj':
 	*clr & cla
 	pcs_horny += 50
 	gs'stat'
-	pcs_exhibition += 3
+	exhibition_exp += 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet2.jpg"></center>'
 	'You can''t believe you''re doing this! Minutes ago you were just looking to relax in the classroom between lessons, and now you''re about to give this guy the best blowjob he''s ever had, in front of all your classmates that''s so hot!'
 	'You impatiently undo the button on his pants and dig your hand in, surely enough finding a hard dick waiting for you. You scoot his pants down a bit and pull it out, giving it a little kiss as you drop to your knees.'
@@ -572,7 +572,7 @@ if $ARGS[0] = 'lunch_bj':
 	cls
 !!should add to arousal
 	gs 'stat'
-	pcs_exhibition += 3
+	exhibition_exp += 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'Hmm he is kind of cute. It could be your good deed for the day? Plus your kinda bored and a little horny. Making sure no one is watching you, you tell him, "Alright then, come with me." You take him by the hand and quickly guide him to the men''s restroom. At first you have to pull him along, he seems to mostly be surprised you agreed, soon he is eagerly leading the way and pulling you along.'
 
@@ -603,7 +603,7 @@ if $ARGS[0] = 'lunch_sex':
 	cls
 	gs 'npcgeneratec', 0, 'a schoolboy you don''t know', rand(15,17)
 	gs 'boyStat', $npclastgenerated
-	pcs_exhibition += 3
+	exhibition_exp += 3
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofbj.jpg"></center>'
 	'Once to the spot on the roof you see several blankets stuff in a corner in a safe little spot. You grab one and the boy helps you lay it out on the roof. With it down, both of you take off your clothes, he lays back on his back. Dropping down next to him you close your <<$liptalk3>> around his <<dick>>cm <<$dick_girth>> cock. Flicking your tongue over the head, licking the pee hole and stimulating the back side of the head with your tongue and lips, while one of your hands plays with his balls.'
 	gs 'arousal', 'bj', 5, 'unknown'

locations/kotovdom

@@ -1,53 +1,54 @@
 # kotovdom
 !new from 1.2.3 fix2
 if $ARGS[0] = 'walk':
-    $location_type = 'event'
-	cls
-	minut += 5
+	$location_type = 'event'
+	minut += 10
 	kotov_bj_times = 0
 	anal_no = 0
-	gs'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
-	i = rand(1,2)
-	if i = 1:'<center><img <<$set_imgh>> src="images/shared/sex/grab/kotovpr.jpg"></center>'
-	if i = 2:'<center><img <<$set_imgh>> src="images/shared/sex/grab/kotovpr.gif"></center>'
-	''
+	gs 'npc_intro',$boy,'images/shared/sex/grab/kotovpr.'+ $iif(rand(0,1)= 0,'jpg','gif'),'',' '
 	'You smile and occasionally glance at Vitek when he walks you home, neither of you saying much on the way there.'
 	'When you climb to the second floor of your apartment building and reach the door, Vitek hugs you tightly in his powerful arms. He kisses you passionately, and his hands grope your butt roughly.'
 	'For a moment you wonder if he''s going to want to have sex with you right here in the stairwell, but as soon as you think that he lets you go. He grins and says: "I''ll see you soon, kitten. Don''t miss me too much!" before turning around and walking down the stairs.'
-	act 'Say goodbye':gt'pod_ezd','etaj_2'
+	gs 'stat'
+	act 'Say goodbye':gt 'pod_ezd','etaj_2'
 end
 
 if $ARGS[0] = 'kotov_kom':
-    $location_type = 'event'
-	cls
+	$location_type = 'event'
 	minut += 1
-	gs'stat'
-	'<center><b><font color="maroon"><<$npc_firstname[''A9'']>> <<$npc_lastname[''A9'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/vann.jpg"></center>'
-	''
-	if pcs_sweat >= 20:'Vitek looks up at you from his bed and says: "You''re all sweaty, kitten. You should go take a shower before going home."'
-	if pcs_sweat < 20 :'"Are you ready?" he asks, looking up at you from the bed. Seeing that you are, he gets up from the bed and puts on some clothes while he says: "Come on, I''ll walk you home."'
+	gs 'stat'
+	gs 'npc_intro',$boy,'images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg','',' '
+	if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex','after_anal','boy',$boydesc
+	if npc_rel[$boy] > 200 and $clothingworntype ! 'nude' and pcs_sweat < 20 :
+		'"Are you ready?" he asks, looking up at you from the bed. Seeing that you are, he gets up from the bed and puts on some clothes while he says: "Come on, I''ll walk you home."'
+		act 'Walk home with Vitek': gt 'kotovdom', 'walk'
+	end
+	if npc_rel[$boy] <= 200 and $clothingworntype ! 'nude' and pcs_sweat < 20 :
+		'"Thanks for fun <<$pcs_nickname>>. " he says looking up at you from the bed. Seeing that you are ready to go, he tells: "Take care, You are always welcome here."'
+		act 'Say goodbye and leave his apartment':gt 'pavResidential'
+	end
+	if pcs_sweat >= 20: 
+		'Vitek looks up at you from his bed and says: "You''re all sweaty, kitten. You should go take a shower before going home."'
+		act 'Nod and look for the bathroom':gt 'kotovdom', 'kotovkom'
+	end
+	if $clothingworntype = 'nude': act 'Dress yourself': gs 'shortgs','dress' & gt 'kotovdom','kotov_kom'
 
-	if pcs_sweat < 20 : act 'Walk home with Vitek': gt 'kotovdom', 'walk'
-	if pcs_sweat >= 20: act 'Nod and look for the bathroom':gt 'kotovdom', 'kotovkom'
 end
 
 if $ARGS[0] = 'vann':
 	$metkaM = $ARGS[0]
 	$locM = $CURLOC
-    $location_type = 'bathroom'
-	cls
+	$location_type = 'bathroom'
+	*clr & cla
 	minut += 1
-	gs'stat'
+	gs 'stat'
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/vann.jpg"></center>'
-	''
+	*nl
 	'Vitek''s old bathroom. It doesn''t look like much, but the shower works just fine.'
-
+	if pain['asshole'] + (agape * 10) > 40: gs 'dinsex','after_anal','no_plug' else gs 'dinsex','after_anal','pc'
 	act 'Wash in the shower (0:15)':
-		cla
-		*clr
+		*clr & cla
 		minut += 15
 		pcs_horny += 1
 		pcs_hairbsh = 0
@@ -66,13 +67,12 @@ end
 if $ARGS[0] = 'kor':
 	$metkaM = $ARGS[0]
 	$locM = $CURLOC
-    $location_type = 'private'
-	cls
+	$location_type = 'private'
+	*clr & cla
 	minut += 1
-	gs'stat'
+	gs 'stat'
 	'<center><b><font color = maroon>Hallway</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/korr.jpg"></center>'
-	''
 	act 'Go to Vitek''s bedroom': gt 'kotovdom','kotovkom'
 	act 'Go to the bathroom': gt 'kotovdom','vann'
 	act 'Go to the kitchen': gt 'kotovdom','kuh'
@@ -81,25 +81,25 @@ end
 if $ARGS[0] = 'kotovkom':
 	$metkaM = $ARGS[0]
 	$locM = $CURLOC
-	cls
+	*clr & cla
 	minut += 1
-	gs'stat'
+	gs 'stat'
 	'<center><b><font color = maroon>Vitek''s bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kotovkom.jpg"></center>'
-	''
-	'<a href="exec:gt ''kotovdom'', ''kotov_kom''">Vitek</a> is lying on his bed, watching TV.'
+	*nl 
+	'<a href="exec:gt ''kotovdom'', ''kotov_kom''">Vitek</a> is lying on his bed, relaxing and watching TV.'
 	act 'Go to the hallway':gt 'kotovdom','kor'
+	if $clothingworntype = 'nude': act 'Dress yourself': gs 'shortgs','dress' & gt 'kotovdom','kotovkom'
 end
 
 if $ARGS[0] = 'kuh':
 	$metkaM = $ARGS[0]
 	$locM = $CURLOC
-	cls
+	*clr & cla
 	minut += 1
-	gs'stat'
+	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/vitekhome/kuh.jpg"></center>'
-	''
 	act 'Go to the hallway':gt 'kotovdom','kor'
 end
 

locations/loadg

@@ -5,182 +5,6 @@ gs 'din_npc'
 
 !!-------------------Above this line to be kept-------------------
 
-! WD: Set variable to store Image needed HTML code
-
-if $ImageNeededPlacholder = '':
-	set $ImageNeededPlacholder = '<center><img src="images/system/image_needed.png"></center>'
-
-end
-
-gs 'din_pav'
-gs 'dinSex2'
-gs 'dina'
-gs 'din_van'
-gs 'din_bad'
-gs 'dinSex'
-gs 'dinBoroda'
-gs 'BanSexType'
-gs 'gschool_lessons', 'npc_data'
-
-if StoryLine = 0 and daystart_start = 0:daystart_start = 145
-
-if vshrink = 0 and vshrinkdays = 0 and ashrink = 0 and ashrinkdays = 0:vshrink = 1 & vshrinkdays = 6 & ashrink = 1 & ashrinkdays = 3
-
-if bankAccount = 0 and karta > 0: 
-	bankAccount = 1
-	
-	if bankDebtLimit = 0: bankDebtLimit = 5000
-
-end
-
-if $cycreport_txt = '':
-	temp[1] = daystart-daylastperiod
-	$cycreport_txt = 'It has been <<temp[1]>> days since you last had a period.'
-
-end
-
-if menoage = 0:
-	menoage = rand(40,50)
-	temprand = rand(0,10)
-	
-	if temprand = 0:
-		menoage += rand(0,5)
-	
-	elseif temprand < 4:
-		menoage += rand(3,10)
-	
-	elseif temprand < 9:
-		menoage += rand(5,12)
-	
-	else
-		menoage += rand(7,13)
-	
-	end
-
-end
-
-monthsend[1] = 31
-
-if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0): 
-	Leapyear = 1 & monthsend[2] = 29
-
-else
-	Leapyear = 0 & monthsend[2] = 28
-
-end
-
-monthsend[3] = 31
-monthsend[4] = 30
-monthsend[5] = 31
-monthsend[6] = 30
-monthsend[7] = 31
-monthsend[8] = 31
-monthsend[9] = 30
-monthsend[10] = 31
-monthsend[11] = 30
-monthsend[12] = 31
-
-$monthName[1] = 'January'
-$monthName[2] = 'February'
-$monthName[3] = 'March'
-$monthName[4] = 'April'
-$monthName[5] = 'May'
-$monthName[6] = 'June'
-$monthName[7] = 'July'
-$monthName[8] = 'August'
-$monthName[9] = 'September'
-$monthName[10] = 'October' 
-$monthName[11] = 'November'
-$monthName[12] = 'December'
-
-$month = $monthName[month]
-
-!!if oldsavehcol = 0: 
-!!commented out as its activating on new games and people should have the used it by now but not deleted in case of queries
-!!DELETE in 0.6.1 or later
-!!	cla
-!!	cls
-!!	*clr	
-!!	:hcolloop
-!!	'There have been changes made to the hair colour system, please indicate your character''s natural hair colour.'
-!!	'Enter 0 (zero) for black, 1 (one) for brown, 2 (two) for red, or 3 (three) for blonde.'
-!!	'Note: Cancelling or entering no value will default to 0, black hair.'
-!!	nathcol = input("Enter the number that corresponds to your character''s natural hair colour:")
-	
-!!	if nathcol >= 0 or nathcol <= 3:
-!!		if pcs_haircol ! nathcol: dyefade = rand(21,35)
-!!		oldsavehcol = 1
-		
-!!		act 'Return to game': gs 'stat' & gt $CURLOC
-	
-!!	else
-!!		'That is not a valid entry.'
-!!		jump 'hcolloop'
-	
-!!	end
-
-!!end
-
-if dounspell = 0 and newbdsp = 0:
-	dounspell = 1
-	dounsplkil = 2
-	nbsize = pcs_cupsize - silicone
-	gs 'body_shape', 'hardreset'
-	newbdsp = 1
-
-end
-
-if succubusflag = 1 and sucpcinfo = 4 and sucinfoday = 0: sucinfoday = daystart + 5 + rand(0,5)
-
-if skin > 0: pcs_skin += 20 * skin & killvar 'skin'
-
-if pcs_apprncbase = 0: gs 'body_shape', 'basebeautycalc', 1
-
-if normbuffpick = 2: bodset = 2 & killvar 'normbuffpick'
-
-:cumidloop
-if arrsize('$cumarrnam') > arrsize('cumarrcnt'):
-	cumarrcnt[arrsize('cumarrcnt')] = -2
-	jump 'cumidloop'
-end
-
-:spidloop
-if arrsize('$sparrnam') > arrsize('sparrcnt'):
-	sparrcnt[arrsize('sparrcnt')] = -1
-	jump 'spidloop'
-end
-
-!!For old save Succubae
-if mutagenP > 0: stren_muta = mutagenP & killvar 'mutagenP'
-if mutagenA > 0: agil_muta = mutagenA & killvar 'mutagenA'
-if mutagenV > 0: vital_muta = mutagenV & killvar 'mutagenV'
-if mutagenI > 0: intel_muta = mutagenI & killvar 'mutagenI'
-if mutagenR > 0: react_muta = mutagenR & killvar 'mutagenR'
-if mutagenW > 0: sprt_muta = mutagenW & killvar 'mutagenW'
-
-!!This sets new attributes to default on saves that did not have these attributes
-if pcs_chrsm <= 0: pcs_chrsm = 10
-if pcs_prcptn <= 0: pcs_prcptn = 10
-
-if pillcvrt = 0:
-	pillcvrt = 1
-	if tabletki > 0:
-		stepa = ((tabletki*100)/28) mod 10
-		stepb = ((tabletki*100)/28) - stepa
-		tabletki = stepb/100
-		pillsleft[0] = (stepa*28)/100
-	end
-end
-
-if karinsex ! 0: TatianaSex = karinsex & killvar 'karinsex'
-if karinsucsex > 0: tatisucsex += karinsucsex & killvar 'karinsucsex'
-if tatianasucsex > 0: tatisucsex += tatianasucsex & killvar 'tatianasucsex'
-
-if $excer_name[1] = '':$excer_name[1] = 'Default 1'
-if $excer_name[2] = '':$excer_name[2] = 'Default 2'
-if $excer_name[3] = '':$excer_name[3] = 'Default 3'
-if $excer_name[4] = '':$excer_name[4] = 'Default 4'
-
 !!-------------------------- above this line can be removed for 0.6.1 ---------------------------------
 
 if dounspell = 1: dounsplkil = 2 & gs 'body_shape', 'hardreset'

locations/npc_intro

@@ -1,18 +1,17 @@
 # npc_intro
 
 ! this procedure is designed for introduction of any npc either with standard or with custom description
-! ARGS[0] is ID number of npc ... required parameter
+! $ARGS[0] is ID number of npc ... required parameter
 ! $ARGS[1] is an image path
 ! $ARGS[2] is a color name of the title  e.g. 'red'
 ! $ARGS[3] is $npc_notes replacement
 ! $ARGS[4] is an additional text
-! Format: gs npc_intro, ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4]
-! Example: gs npc_intro, 23, '', 'green', '', 'Optional text here' <=== This would display Albina''s picture using the path in # npcstatic1 with her name above it in green text followed by her default description and finally, your relationship level.
+! Format: gs 'npc_intro', ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4]
+! Example: gs 'npc_intro', 'A23', '', 'green', '', 'Optional text here' <=== This would display Albina''s picture using the path in # npcstatic1 with her name above it in green text followed by her default description and finally, your relationship level.
 !Credit goes to rachels for coming up with the concept and initial code!!!
 
 *clear
-numnpc = args[0]
-$static_num = 'A<<numnpc>>'
+$static_num = $args[0]
 
 if npc_rel[$static_num] < 20: $npc_cur_rel = 'You don''t get along at all with <<$npc_firstname[$static_num]>>.'
 if npc_rel[$static_num] >= 20 and $npc_rel[$static_num] < 40: $npc_cur_rel = 'You don''t get along very well with <<$npc_firstname[$static_num]>>.'
@@ -48,7 +47,6 @@ if $apendix ! '' and $apendix ! ' ':$apendix
 killvar '$npc_cur_rel'
 killvar '$apendix'
 killvar '$description'
-killvar 'numnpc'
 killvar '$static_num'
 killvar '$image_path'
 

locations/park

@@ -113,10 +113,9 @@ if $ARGS[0] = 'start':
 			cla
 			*clr
 			parkrunday = daystart
-			minut += 60
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			pcs_sweat += 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0, 4)
+			pcs_sweat += 5
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'
 			'You randomly take the paths, you run them up and down and about an hour later, you are out of breath and heavily sweating.'
 

locations/parkivent

@@ -826,10 +826,9 @@ if $ARGS[0] = 'run':
 	if $clothingworntype = 'exercise' and hour > 5 and hour < 22 and daybegskver ! daystart:
 		act 'Go for a run in the park (1:00)':
 			cls
-			minut += 60
-			fat -= rand(2, 7)
-			run_exp += rand(0, 2)
-			pcs_sweat += 20
+			gs 'exercise', 'tier1', 60, 'run_exp'
+			fat -= rand(0, 4)
+			pcs_sweat += 5
 			daybegskver = daystart
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/parkbeg.jpg"></center>'

locations/parks

@@ -41,13 +41,15 @@ if $ARGS[0] = 'start':
 
 				waiting = input ("How many minutes of sitting? (Not more 120 minutes)")
 
-				if waiting <= 0 or waiting > 120:
+				if waiting > 120:
 					minut = minut + 15
-				elseif waiting > 0 and waiting <= 120:
+				elseif waiting > 0:
 					minut = minut + waiting
 					pcs_mood += 10
 					pcs_willpwr = pcs_willpwr + 10
 					if pcs_sleep < 90:pcs_sleep += 10
+				else
+					'Invalid time.'
 				end
 
 				act 'Consult a watch': gt 'parks', 'start'

locations/pod_ezd

@@ -645,7 +645,7 @@ if $ARGS[0] = 'etaj3_smoke_shulga':
 		pcs_mood +=5
 		npc_rel['A11'] +=1
 		gs 'stat'
-		gs 'npc_intro',11,'images/characters/pavlovsk/school/boy/vasya/vasya.jpg','','Vasily, also known as Shulga, is usually seen together with his friends Dan and Vitek. Vitek often makes jokes at his expense, but they''re very good friends nevertheless.'
+		gs 'npc_intro','A11','images/characters/pavlovsk/school/boy/vasya/vasya.jpg','','Vasily, also known as Shulga, is usually seen together with his friends Dan and Vitek. Vitek often makes jokes at his expense, but they''re very good friends nevertheless.'
 		'You spend the next 5 minutes smoking a cigarette with him, talking about trivial things. When it''s gone, you thank him for the cigarette and turn to leave.'
 		act 'Leave': gt 'pod_ezd', 'etaj_3'
 	end
@@ -669,7 +669,7 @@ if $ARGS[0] = 'etaj3_smoke_shulga_den':
 		pcs_mood +=5
 		npc_rel['A11'] +=1
 		gs 'stat'
-		gs 'npc_intro',11,'images/characters/pavlovsk/school/boy/vasya/vasya.jpg','','Vasily, also known as Shulga, is usually seen together with his friends Dan and Vitek. Vitek often makes jokes at his expense, but they''re very good friends nevertheless.'
+		gs 'npc_intro','A11','images/characters/pavlovsk/school/boy/vasya/vasya.jpg','','Vasily, also known as Shulga, is usually seen together with his friends Dan and Vitek. Vitek often makes jokes at his expense, but they''re very good friends nevertheless.'
 		'You spend the next 5 minutes smoking a cigarette with him, talking about trivial things. When it''s gone, you thank him for the cigarette and turn to leave.'
 		act 'Leave': gt 'pod_ezd', 'etaj_3'
 	end
@@ -679,7 +679,7 @@ if $ARGS[0] = 'etaj3_smoke_shulga_den':
 		pcs_mood +=5
 		npc_rel['A10'] +=1
 		gs 'stat'
-		gs 'npc_intro',10,'images/characters/pavlovsk/school/boy/dan/dan.jpg','','Dan, short for Denis, is a long and skinny guy. He has a certain aura of disdain around him, and it never feels like he takes the people he talks with very seriously. He''s best friends with Vasily and Vitek, and spends most of his time with them.'
+		gs 'npc_intro','A10','images/characters/pavlovsk/school/boy/dan/dan.jpg','','Dan, short for Denis, is a long and skinny guy. He has a certain aura of disdain around him, and it never feels like he takes the people he talks with very seriously. He''s best friends with Vasily and Vitek, and spends most of his time with them.'
 		'You spend the next 5 minutes smoking a cigarette with him, talking about trivial things. Sometimes you get the feeling he''s mocking you, but he''s never impolite in a direct manner so you let it slide.'
 		act 'Leave': gt 'pod_ezd', 'etaj_3'
 	end	

locations/preCUST

@@ -257,7 +257,7 @@ if $ARGS[0] = 'Done':
 
 !!adding default shoes and assigning them
 
-	scheap[6] = 1
+	sgandm[6] = 1
 	strainers[21] = 1
 
 	$cheapshoetype = 'gandm' & cheapshoenumber = 6

locations/pregriskeval

@@ -1,11 +1,14 @@
 # pregriskeval
+!! this function returns value, which represents risk factor of conception
+!! -4 when PC is pregnant
+!! -3 when PC has got her period
+!! -2 when the used contraception is birth control shot 
+!! -1 when PC is on the pills or if PC has used hormonal contraception at least two weeks
+!!  0 when they do not use protection or the condom fails
+!!  1 when they do not use protection or the condom fails and PC do not want to use a contraception
+!!  2 when the condom is sabotaged by the PC or when she pretends to be on pills
 
-argc = arrsize('ARGS')
-if argc > 0:
-	eff_contra = ARGS[1]
-else
-	eff_contra = sexcontra
-end
+eff_contra = iif(arrsize('ARGS') > 0,ARGS[0],sexcontra)
 
 if knowpreg = 1 or thinkpreg = 1:
 	RESULT = -4
@@ -25,6 +28,5 @@ elseif eff_contra = 1 or eff_contra = 7:
 	!{Definitely delibarately trying to get pregnant.}
 	RESULT = 2
 end
-
 --- pregriskeval ---------------------------------
 

locations/qwBarPolet

@@ -924,6 +924,7 @@ if $ARGS[0] = 'billiard':
 				act 'Play again':
 					cla
 					*nl
+					billard_ev_var = 1
 					'"Alright, let''s play."'
 					'You open your purse and pull out enough money to lay it down on the table. He grins, racks up the balls and lets you break again as he lays his money down on top of yours.'
 					gt 'qwBarPolet', 'billiard'

locations/saveupdater

@@ -1,263 +1,11 @@
 # saveupdater
 
-if VersionCheck < 504:
-    gs 'npcstatic1'
-    gs 'npcstatic2'
-    gs 'npcstatic3'
-    gs 'npcstatic4'
-	gs 'gschool_lessons', 'npc_data'
-	pcs_dob = birthyear * 10000
-	pcs_dob += birthmonth * 100
-	pcs_dob += birthday
-	pcs_horny = horny
-	pcs_stren = stren
-	pcs_agil  = agil
-	pcs_vital = vital
-	pcs_intel = intel
-	pcs_haircol = hcol
-	npc_rel['A28'] = father
-	npc_rel['A29'] = mother
-	npc_rel['A33'] = sister
-	npc_rel['A34'] = brother
-	npc_rel['A60'] = MiraQW
-	npc_rel['A89'] = JenyaLC
-	pcs_grades = Suspeh
-	pcs_tan = tan
-	pcs_vball = volleyboll
-	pcs_hairlng = hairlength
-	pcs_haircol = hcol
-	pcs_nerd = nerdism
-	pcs_dom = dom
-	$pcs_firstname = $name
-	$pcs_nickname = $nickname
-	$pcs_lastname = $surname
-	$pcs_usedname = $nickname
-	VersionCheck = 5030
-	npc_QW['A29'] = motherQW
-	npc_QW['A33'] = sisboyQW
-	npc_QW['A34'] = brotherQW
-	npc_QW['A60'] = Miraperversion
-	npc_QW['A63'] = Mitkasextimes
-	npc_QW['A64'] = MiraFatherQW
-	npc_QW['A89'] = barmenshameet
-	LCEugenefirst = JenyaLCfirst
-	npc_drunk['A60'] = miralko
-	npc_QW['A66'] = piratsuka
-	killvar 'piratsuka'
-	killvar 'sisboyQW'
-	killvar 'brotherQW'
-	killvar 'motherQW'
-	killvar 'barmenshameet'
-	killvar 'JenyaLC'
-	killvar 'JenyaLCfirst'
-	killvar 'horny'
-	killvar 'stren'
-	killvar 'agil'
-	killvar 'vital'
-	killvar 'intel'
-	killvar 'hcol'
-	killvar 'father'
-	killvar 'mother'
-	killvar 'sister'
-	killvar 'brother'
-	killvar 'Suspeh'
-	killvar 'tan'
-	killvar 'volleyboll'
-	killvar 'hairlength'
-	killvar 'hcol'
-	killvar 'nerdism'
-	killvar 'dom'
-	killvar '$name'
-	killvar '$nickname'
-	killvar '$surname'
-	killvar '$boy'
-	killvar 'MiraQW'
-	killvar 'Miraperversion'
-	killvar 'Mitkasextimes'
-	killvar 'MiraFatherQW'
-	killvar 'miralko'
-	$boy = 'D0'
-
-	!!The following part update the cum related arrays from an old savegame to the new MGX format.
-	cycletemp = 0
-	:cumarrupd
-	if cycletemp < arrsize('$cumarrnam'):
-		tempnpcid = arrpos('$Astat_usedname', $cumarrnam[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$cumarrnam[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$cumarrnam[cycletemp] = 'A<<tempnpcid>>'
-		elseif cumarrkno[cycletemp] > 0:
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly cum entry <<cycletemp>> with name <<$cumarrnam[cycletemp]>></font></b>'
-			gs 'npcgeneratec', 0, $cumarrnam[cycletemp], rand(18,60)
-			$cumarrnam[cycletemp] = $npclastgenerated
-		else
-			gs 'npcgeneratec', 0, $cumarrnam[cycletemp], rand(18,60)
-			$cumarrnam[cycletemp] = $npclastgenerated
-		end
-		cycletemp += 1
-		jump 'cumarrupd'
-	end
-	cycletemp = 0
-	:sparrupd
-	if cycletemp < arrsize('$sparrnam'):
-		tempnpcid = arrpos('$Astat_usedname', $sparrnam[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$sparrnam[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$sparrnam[cycletemp] = 'A<<tempnpcid>>'
-		elseif sparrkno[cycletemp] > 0:
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly spatter entry <<cycletemp>> with name <<$sparrnam[cycletemp]>></font></b>'
-			gs 'npcgeneratec', 0, $sparrnam[cycletemp], rand(18,60)
-			$sparrnam[cycletemp] = $npclastgenerated
-		else
-			gs 'npcgeneratec', 0, $sparrnam[cycletemp], rand(18,60)
-			$sparrnam[cycletemp] = $npclastgenerated
-		end
-		cycletemp +=1
-		jump 'sparrupd'
-	end
-	cycletemp = 0
-	:cumcbcupd
-	if cycletemp < arrsize('$ChildFath'):
-		tempnpcid = arrpos('$Astat_usedname', $ChildFath[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$ChildFath[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$ChildFath[cycletemp] = 'A<<tempnpcid>>'
-		else
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly father entry <<cycletemp>> with name <<$ChildFath[cycletemp]>></font></b>'
-			gs 'npcgeneratec', 0, $ChildFath[cycletemp], rand(18,60)
-			$ChildFath[cycletemp] = $npclastgenerated
-		end
-		tempnpcid = arrpos('$Astat_usedname', $ChildThFath[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$ChildThFath[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$ChildThFath[cycletemp] = 'A<<tempnpcid>>'
-		else
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly tought father entry <<cycletemp>> with name <<$ChildThFath[cycletemp]>></font></b>'
-			$ChildThFath[cycletemp] = 'unknown'
-		end
-		cycletemp +=1
-		jump 'cumcbcupd'
-	end
-	cycletemp = 0
-	:wombpotupd
-	if cycletemp < arrsize('$wombpotfath'):
-		tempnpcid = arrpos('$Astat_usedname', $wombpotfath[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$wombpotfath[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$wombpotfath[cycletemp] = 'A<<tempnpcid>>'
-		elseif $wombpotfath[cycletemp] = 'Unknown':
-			$wombpotfath[cycletemp] = 'unknown'
-		else
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly father entry <<cycletemp>> with name <<$wombpotfath[cycletemp]>></font></b>'
-			gs 'npcgeneratec', 0, $wombpotfath[cycletemp], rand(18,60)
-			$wombpotfath[cycletemp] = $npclastgenerated
-		end
-		cycletemp +=1
-		jump 'wombpotupd'
-	end
-	cycletemp = 0
-	:cumfthupd
-		if cycletemp < arrsize('$cumfthname'):
-		tempnpcid = arrpos('$Astat_usedname', $cumfthname[cycletemp])
-		if tempnpcid > 0:
-			MSG '<br><b><font color="teal">DEBUG: Legacy name in save updated from <<$cumfthname[cycletemp]>> to A<<tempnpcid>></font></b>'
-			$cumfthname[cycletemp] = 'A<<tempnpcid>>'
-		else
-			MSG '<br><b><font color="red">WARNING: Unable to upgrade correctly father entry <<cycletemp>> with name <<$cumfthname[cycletemp]>></font></b>'
-			gs 'npcgeneratec', 0, $cumfthname[cycletemp], rand(18,60)
-			$cumfthname[cycletemp] = $npclastgenerated
-		end
-		cycletemp +=1
-		jump 'cumfthupd'
-	end
-end
-
 pcs_dob = (birthyear * 10000) + (birthmonth * 100) + birthday
 
-if Astat_horny[0] > 0: pcs_horny = Astat_horny[0]
-if Astat_stren[0] > 0: pcs_stren = Astat_stren[0]
-if Astat_agil[0] > 0: pcs_agil = Astat_agil[0]
-if Astat_vital[0] > 0: pcs_vital = Astat_vital[0]
-if Astat_intel[0] > 0: pcs_intel = Astat_intel[0]
-if Astat_haircol[0] > 0: pcs_haircol = Astat_haircol[0]
-if Astat_grades[0] > 0: pcs_grades = Astat_grades[0]
-if Astat_tan[0] > 0: pcs_tan = Astat_tan[0]
-if Astat_vball[0] > 0: pcs_vball = Astat_vball[0]
-if Astat_hairlng[0] > 0: pcs_hairlng = Astat_hairlng[0]
-if Astat_dom[0] > 0: pcs_dom = Astat_dom[0]
-if Astat_nerd[0] > 0: pcs_nerd = Astat_nerd[0]
-if $Astat_firstname[0] ! '': $pcs_firstname = $Astat_firstname[0]
-if $Astat_nickname[0] ! '': $pcs_nickname = $Astat_nickname[0]
-if $Astat_lastname[0] ! '': $pcs_lastname = $Astat_lastname[0]
-
-if horny > 0: pcs_horny += horny & killvar 'horny'
-if stren > 0: stren_exp += stren & killvar 'stren'
-if agil > 0: agil_exp += agil & killvar 'agil'
-if vital > 0: vital_exp += vital & killvar 'vital'
-if intel > 0: intel_exp += intel & killvar 'intel'
-if hcol > 0: pcs_haircol += hcol & killvar 'hcol'
-if Suspeh > 0: pcs_grades += Suspeh & killvar 'Suspeh'
-if tan > 0: pcs_tan += tan & killvar 'tan'
-if volleyboll > 0: vball_exp += volleyboll & killvar 'volleyboll'
-if hairlength > 0: pcs_hairlng += hairlength & killvar 'hairlength'
-if dom > 0: pcs_dom += dom & killvar 'dom'
-if $name ! '': $pcs_firstname = $name & killvar '$name'
-if $nickname ! '': $pcs_nickname = $nickname & killvar '$nickname'
-if $surname ! '': $pcs_lastname = $surname & killvar '$surname'
-if beg > 0: pcs_run = beg & killvar 'beg'
-if dance > 0: pcs_danc = dance & killvar 'dance'
-if will > 0: pcs_sprt = will & killvar 'will'
-if magik > 0: pcs_magik = magik & killvar 'magik'
-if react > 0: pcs_react = react & killvar 'react'
-if chess > 0: pcs_chess = chess & killvar 'chess'
-if Jab > 0: pcs_jab = Jab & killvar 'Jab'
-if Kik > 0: pcs_kick = Kik & killvar 'Kik'
-if KikDef > 0: pcs_def = KikDef & killvar 'KikDef'
-if oficiant > 0: pcs_servng = oficiant & killvar 'oficiant'
-if poledance > 0: pcs_dancpol = poledance & killvar 'poledance'
-if poSkill > 0: pcs_sewng = poSkill & killvar 'poSkill'
-if Punch > 0: pcs_punch = Punch & killvar 'Punch'
-if shoot > 0: pcs_shoot = shoot & killvar 'shoot'
-if stripdance > 0: pcs_dancero = stripdance & killvar 'stripdance'
-if vokal > 0: pcs_vokal = vokal & killvar 'vokal'
-if glacol > 0: pcs_eyecol = glacol & killvar 'glacol'
-if glaraz > 0: pcs_eyesize = glaraz & killvar 'glaraz'
-if grudi > 0: pcs_bust = grudi & killvar 'grudi'
-if leghair > 0: pcs_leghair = leghair & killvar 'leghair'
-if lip > 0: pcs_lip = lip & killvar 'lip'
-if lobok > 0: pcs_pubes = lobok & killvar 'lobok'
-if nipple_size > 0: pcs_nips = nipple_size & killvar 'nipple_size'
-if resnic > 0: pcs_lashes = resnic & killvar 'resnic'
-if rost > 0: pcs_hgt = rost & killvar 'rost'
-if skinvan > 0: pcs_skin = skinvan & killvar 'skinvan'
-if fbreath > 0: pcs_breath = fbreath & killvar 'fbreath'
-if hapri > 0: pcs_hairbsh = hapri & killvar 'hapri'
-if lipbalmstat > 0: pcs_lipbalm = lipbalmstat & killvar 'lipbalmstat'
-if mop > 0: pcs_makeup = mop & killvar 'mop'
-if sweat > 0: pcs_sweat = sweat & killvar 'sweat'
-if vnesh > 0: pcs_apprnc = vnesh & killvar 'vnesh'
-if anus > 0: pcs_ass = anus & killvar 'anus'
-if mood > 0: pcs_mood = mood & killvar 'mood'
-if manna > 0: pcs_manna = manna & killvar 'manna'
-if health > 0: pcs_health = health & killvar 'health'
-if willpower > 0: pcs_willpwr = willpower & killvar 'willpower'
-if energy > 0: pcs_energy = energy & killvar 'energy'
-if son > 0: pcs_sleep = son & killvar 'son'
-if bedra > 0: pcs_hips = bedra & killvar 'bedra'
-if talia > 0: pcs_waist = talia & killvar 'talia'
-if grutal > 0: pcs_band = grutal & killvar 'grutal'
-if titK > 0: pcs_cupsize = titK & killvar 'titK'
-if ves > 0: pcs_weight = ves & killvar 'ves'
-if throat > 0: pcs_throat = throat & killvar 'throat'
-if vagina > 0: pcs_vag = vagina & killvar 'vagina'
-if zub > 0: pcs_teeth = zub & killvar 'zub'
-if vasya_shulgin > 0: npc_rel['A11'] = vasya_shulgin & killvar 'vasya_shulgin'
 if karinsucsexday > 0:tatianasucsexday = karinsucsexday & killvar 'karinsucsexday'
 if karinsucsex > 0: tatianasucsex = karinsucsex & killvar 'karinsucsex'
 if KarinSex > 0: tatianaSex = KarinSex & killvar 'KarinSex'
 
-killvar 'Astat'
-
 if JenyaLCfirst > 0: LCEugenefirst = JenyaLCfirst & killvar 'JenyaLCfirst'
 if JenyaLC > 0:npc_rel['A89'] = JenyaLC & killvar 'JenyaLC'
 if serge_shulgin > 0:npc_rel['A112'] = serge_shulgin & killvar 'serge_shulgin'

locations/sexdvoe

@@ -114,7 +114,9 @@ if $ARGS[0] = 'sex':
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvoe/dp<<picrand>>.jpg"></center>'
 		if sameboy = 1:
 			'Both of them fuck you, one of them your ass, the other your pussy. The double friction gives you great pleasure as they are pumping in and out of your body in tandem.'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'anal', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -122,7 +124,9 @@ if $ARGS[0] = 'sex':
 			gs 'cum_call', '', $boy
 		elseif sexdvoeloc = 1:
 			'Both of them fuck you, <<$boydesc[1]>> in your ass, <<$boydesc[0]>> in your pussy. The double friction gives you great pleasure as they are pumping in and out of your body in tandem.'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'anal', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -130,7 +134,9 @@ if $ARGS[0] = 'sex':
 			if $knownboy[0] = 1:gs 'cum_call', '', $boy[0], 1 else gs 'cum_call', '', $boy[0]
 		else
 			'Both of them fuck you, <<$boydesc[0]>> in your ass, <<$boydesc[1]>> in your pussy. The double friction gives you great pleasure as they are pumping in and out of your body in tandem.'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'anal', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -163,7 +169,9 @@ if $ARGS[0] = 'sex':
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvoe/vag<<picrand>>.jpg"></center>'
 		if sameboy = 1:
 			'While one guy is fucking your pussy, you diligently suck off the second.'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -171,7 +179,9 @@ if $ARGS[0] = 'sex':
 			gs 'cum_call', '', $boy[0]
 		elseif sexdvoeloc = 3:
 			'While <<$boydesc[0]>> is fucking your pussy, you diligently suck off <<$boydesc[1]>>.'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -179,7 +189,9 @@ if $ARGS[0] = 'sex':
 			if $knownboy[0] = 1:gs 'cum_call', '', $boy[0], 1 else gs 'cum_call', '', $boy[0]
 		else
 			'While <<$boydesc[1]>> is fucking your pussy, you diligently suck off <<$boydesc[0]>>.'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'vaginal', 10, 'sub'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'
@@ -213,19 +225,25 @@ if $ARGS[0] = 'sex':
 		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvoe/anal<<picrand>>.jpg"></center>'
 		if sameboy = 1:
 			'While one guy is fucking your ass, you diligently suck off the second.'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'anal', 10, 'sub'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'
 		elseif sexdvoeloc = 3:
 			'While <<$boydesc[0]>> is fucking your ass, you diligently suck off <<$boydesc[1]>>.'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'anal', 10, 'sub'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'
 		else
 			'While <<$boydesc[1]>> is fucking your ass, you diligently suck off <<$boydesc[0]>>.'
+			gs 'boyStat', $boy[1]
 			gs 'arousal', 'anal', 10, 'sub'
+			gs 'boyStat', $boy[0]
 			gs 'arousal', 'bj', 10, 'sub'
 			minut -= 10
 			gs 'stat'

locations/shoes

@@ -40,26 +40,6 @@ $shoe_list_line = {
 
 }
 
-!!cloc, 0 = wardrobe, 1 = storage, 2 = unwanted
-
-
-if $ARGS[0] = 'dest0':
-	*clr
-	dynamic '<<$ARGS[2]>>S[<<ARGS[3]>>] = 0'
-	gt 'shoes', 'view_shoe_list', $ARGS[1]
-end
-
-if $ARGS[0] = 'dest1':
-	*clr
-	dynamic '<<$ARGS[2]>>S[<<ARGS[3]>>] = 1'
-	gt 'shoes', 'view_shoe_list', $ARGS[1]
-end
-
-if $ARGS[0] = 'dest2':
-	*clr
-	dynamic '<<$ARGS[2]>>S[<<ARGS[3]>>] = 2'
-	gt 'shoes', 'view_shoe_list', $ARGS[1]
-end
 
 if $ARGS[0] = 'select':
 	cla
@@ -117,38 +97,38 @@ if $ARGS[0] = 'view_shoe_list':
 	if $cloType ! 'exercise':
 		i = 1
 		:loopsboutique
-			if sboutique[i] = 1 and sboutiqueS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'boutique', i)
+			if sboutique[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'boutique', i)
 			i += 1
 		if i <= 37:jump 'loopsboutique'
 
 		i = 1
 		:loopspussy
-			if spussy[i] = 1 and spussyS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'pussy', i)
+			if spussy[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'pussy', i)
 			i += 1
 		if i <= 38:jump 'loopspussy'
 
 		i = 1
 		:loopsdolls
-			if sdolls[i] = 1 and sdollsS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
+			if sdolls[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'dolls', i)
 			i += 1
 		if i <= 27:jump 'loopsdolls'
 
 		i = 1
 		:loopsfetish
-			if sfetish[i] = 1 and sfetishS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'fetish', i)
+			if sfetish[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'fetish', i)
 			i += 1
 		if i <= 27:jump 'loopsfetish'
 
 		i = 1
 		:loopsgandm
-			if sgandm[i] = 1 and sgandmS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'gandm', i)
+			if sgandm[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'gandm', i)
 			i += 1
 		if i <= 51:jump 'loopsgandm'
 	end
 
 	i = 1
 	:loopstrainers
-		if strainers[i] = 1 and strainersS[i] = cloc:*P dyneval($shoe_list_line, $ARGS[1], 'trainers', i)
+		if strainers[i] = 1:*P dyneval($shoe_list_line, $ARGS[1], 'trainers', i)
 		i += 1
 	if i <= 29:jump 'loopstrainers'
 

locations/shortgs

@@ -1,6 +1,7 @@
 # shortgs
-!smoker - handles all changes which happen when PC smokes one cigarette
-! use : gs 'shortgs','smoker'
+
+!! smoker - handles all changes which happen when PC smokes one cigarette
+!! use : gs 'shortgs','smoker'
 if $ARGS[0] = 'smoker':
 	siga -= 1
 	smoker += 1
@@ -17,8 +18,8 @@ if $ARGS[0] = 'smoker':
 	gs '$menu_obnovit'
 end &!--- smoker ---
 
-!milk_me
-! use href="exec:gt ''shortgs'', ''milk_me''"
+!! milk_me
+!! use href="exec:gt ''shortgs'', ''milk_me''"
 if $ARGS[0] = 'milk_me':
 	minut += 15
 	if $location_type ! 'bathroom':
@@ -53,8 +54,9 @@ if $ARGS[0] = 'milk_me':
 	end
 	act 'Finish':gt $locM, $metkaM
 end &! --- milk_me ---
-! following function counts the number of guys which PC slept with. 
-! use func('shortgs','guy') or func('shortgs','guy',X) for subset (X can be 'A','B','C','AB','AC','BC')
+
+!! following function counts the number of guys which PC slept with. 
+!! use func('shortgs','guy') or func('shortgs','guy',X) for subset (X can be 'A','B','C','AB','AC','BC')
 if $ARGS[0] = 'guy':
 	r_sht=0
 	if $ARGS[1] = '': $temptask = 'ABC' else $temptask = $ARGS[1]
@@ -76,8 +78,9 @@ if $ARGS[0] = 'guy':
 	killvar '$temptaskchar'
 	killvar 's_sht'
 end &! --- guy ---
-! following function counts the number of girls which PC slept with.
-! use func('shortgs','girl') or func('shortgs','girl',X) for subset (X can be 'A','B','C','AB','AC','BC')
+
+!! following function counts the number of girls which PC slept with.
+!! use func('shortgs','girl') or func('shortgs','girl',X) for subset (X can be 'A','B','C','AB','AC','BC')
 if $ARGS[0] = 'girl':
 	r_sht=0
 	if $ARGS[1] = '': $temptask = 'ABC' else $temptask = $ARGS[1]
@@ -99,5 +102,21 @@ if $ARGS[0] = 'girl':
 	killvar 's_sht'
 end &! --- girl ---
 
+!! following procedure should be used when PC gets naked, but it should be paired with the reverse procedure 
+!! use gs 'shortgs','undress'
+if $ARGS[0] = 'undress':
+	gs 'clothing', 'strip'
+	if tanga = 1:panties = 1 & tanga = 0
+end &! --- undress ---
+
+!! reverse procedure, it can be modified for lose or stolen panties later. 
+!! use gs 'shortgs','dress'
+if $ARGS[0] = 'dress':
+	gs 'clothing', 'wear_last_worn'
+	if panties = 1:tanga = 1
+	panties = 0
+end &! --- dress ---
+
+
 --- shortgs ---------------------------------
 

locations/sitr

@@ -101,6 +101,7 @@ end
 gs 'events', 'read'
 
 act 'Go out to the balcony': gt 'balkon','start'
+
 if zoo >= 6 and sobaka ! 0:
 	if husband > 0 and husbandrink ! 10:
 		if week > 5 or week < 6 and hour > 17:
@@ -113,6 +114,8 @@ if zoo >= 6 and sobaka ! 0:
 
 				if harakHusb = 0:
 					zoo += 1
+					stat['vaginal'] += 1
+					pcs_vag += 1
 					pcs_horny = 0
 					orgasm += 1
 					husband -= 1

locations/soba

@@ -186,7 +186,7 @@ if $ARGS[0] = 'gamedog':
 		act 'Have sex with your dog':
 			cla
 			*clr
-			gs 'stat'
+			pcs_vag += 3
 			'<center><img <<$set_imgh>> src="images/beast/zoo/5.jpg"></center>'
 			'Realizing <<$namesob>> is now hungry for sex, you excitedly guide him into your wet cunt. Vaginal sex with a pet is very unusual.'
 			'Dog fucks you in powerful spurts. He thrusts deep into your crotch, and an animal brings you to a shuddering orgasm.'
@@ -270,7 +270,7 @@ if $ARGS[0] = 'hardcoredog':
 					act 'Doggy doggy':
 						cla
 						*clr
-						gs 'stat'
+						pcs_vag += 3
 						'<center><img <<$set_imgh>> src="images/beast/zoo/spa2.jpg"></center>'
 						'<<$namesob>> jumps on you and starts to rub his cock against your vagina'
 						'You are shaking with the need for release and must have something inside you'
@@ -368,6 +368,7 @@ if $ARGS[0] = 'hardcoredog':
 				act 'Continue resisting':
 					cla
 					*clr
+					pcs_vag += 3
 					'<center><img <<$set_imgh>> src="images/beast/zoo/zoof5.jpg"></center>'
 					'Your struggle with <<$namesob>> fails,	<<$namesob>> puts his paws on your shoulders and pushing you down, enters your pussy.'
 					'<center><img <<$set_imgh>> src="images/beast/zoo/zoof6.jpg"></center>'
@@ -463,7 +464,7 @@ if $ARGS[0] = 'cumshot2':
 	spafinloc = 0
 	dynamic $dogpot
 	gs 'cum_manage'
-	gs 'stat'
+	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zoof8.jpg"></center>'
 	'<<$namesob>> discharges into your vagina, you stick together with the dog passionately'
 
@@ -509,7 +510,7 @@ if $ARGS[0] = 'zoof14':
 	dynamic $dogpot
 	spafinloc = 0
 	gs 'cum_manage'
-	gs 'stat'
+	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl4.jpg"></center>'
 	'You take the hold of <<$namesob>>s cock and start to fuck yourself with it.'
 
@@ -531,7 +532,7 @@ if $ARGS[0] = 'zoof15':
 	dynamic $dogpot
 	spafinloc = 0
 	gs 'cum_manage'
-	gs 'stat'
+	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/yl5.jpg"></center>'
 	'You turn your back on <<$namesob>>, he jumps on you and starts to fuck you.'
 
@@ -602,7 +603,7 @@ if $ARGS[0] = 'zoof27':
 		dynamic $dogpot
 		spafinloc = 0
 		gs 'cum_manage'
-		gs 'stat'
+		pcs_vag += 3
 		'<center><img <<$set_imgh>> src="images/beast/zoo/kuh.jpg"></center>'
 		'You assume the position, doggy ​​jumps on you and starts fucking.'
 		'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -662,7 +663,7 @@ if $ARGS[0] = 'zoof30':
 		'<<$namesob>> run up to you and starts licking between your legs.'
 		'You start to feel the warmth as your arousal builds.'
 
-		gs 'arousal', 'vaginal', 10, 'beast'
+		gs 'arousal', 'cuni', 10, 'beast'
 		gs 'stat'
 
 		act 'Lie on floor and spread your legs':
@@ -690,7 +691,7 @@ if $ARGS[0] = 'dogcancerstyle':
 	dynamic $dogpot
 	spafinloc = 0
 	gs 'cum_manage'
-	gs 'stat'
+	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal3.jpg"></center>'
 	'You get on all fours and your dog ​​jumps you and starts fucking your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -712,7 +713,7 @@ if $ARGS[0] = 'dogmissionarystyle':
 	dynamic $dogpot
 	spafinloc = 0
 	gs 'cum_manage'
-	gs 'stat'
+	pcs_vag += 3
 	'<center><img <<$set_imgh>> src="images/beast/zoo/zal2.jpg"></center>'
 	'You push yourself up on ti your feet, from this better angle <<$namesob>> easily finds his way into your pussy.'
 	'It doesn''t take for <<$namesob>> to cum inside you.'
@@ -891,7 +892,7 @@ if $ARGS[0] = 'dzoof1':
 																act 'Yes, you want it':
 																	cla
 																	*clr
-																	gs 'stat'
+																	pcs_vag += 3
 																	'<center><img <<$set_imgh>> src="images/beast/zoo/dzoof14.jpg"></center>'
 																	'Sonia takes Rex and puts him in you, his cock quickly entering your pussy.'
 																	'"Now lick me!" orders Sonia.'

locations/stat

@@ -450,17 +450,11 @@ if minut >= 60:
 		pcs_mood -= 10
 	end
 
-	if tanga = 0 and PCloPants > 0 and $clothingworntype ! 'nude':mosolpred += 1
+	if tanga = 0 and PCloPants > 0 and $clothingworntype ! 'nude':mosol += 1
 
+	if mosol >= 50: pcs_mood -= 5
 
-	if mosolpred >= 10:
-		mosol += 1
-		mosolpred -= 10
-	end
-
-	if mosol >= 50:
-		pcs_mood -= 5
-	end
+	if mosol >= 30 and pain['pubic'] < 80: gs 'pain', 1, 'pubic', 'ache'
 
 	if pcs_energy > 100:
 		fat += (pcs_energy - 100) / 4
@@ -468,7 +462,7 @@ if minut >= 60:
 	end
 
 	if mosol > 0:
-		if tanga = 1 or $clothingworntype = 'nude':mosol -= 1
+		if tanga = 1 or $clothingworntype = 'nude':mosol -= rand(0,1)
 	end
 
 	if pcs_lipbalm > 0:pcs_lipbalm -= 1

locations/vann

@@ -131,12 +131,14 @@ if $ARGS[0] = 'start':
 
 	act 'Get out':gt 'vann', 'fin'
 
-	if mosolmaz > 0 and mosol > 0:
+	if mosolmaz > 0 and mosol > 0 and mosal_time ! (daystart * 100) + hour:
 		act 'Rub ointment onto your pussy (0:05)':
 			cla
+			mosal_time = (daystart * 100) + hour
 			minut += 5
 			mosolmaz -= 1
 			mosol -= 5
+			if pain['pubic'] > 3: pain['pubic'] -= 3
 			'You take a tube of cream and rub it onto your itchy vulva.'
 
 			act 'Get out and get dressed':gt 'vann', 'start'

locations/vokzalGin

@@ -48,8 +48,8 @@ if $ARGS[0] = '':
 			act 'Mop the waiting room floor (1:00)':
 				cls
 				cleZalDay = daystart
-				minut += 60
-				gs 'exercise', 'tier1', 1, 'stren_exp', 'vital_exp'
+				gs 'exercise', 'tier1', 60, 'stren_exp', 'vital_exp'
+				pcs_mood -= 6
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 				'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and wash the floor in the waiting room.'
@@ -62,8 +62,8 @@ if $ARGS[0] = '':
 			act 'Clean the men''s restroom (0:30)':
 				cls
 				cleMTDay = daystart
-				minut += 30
-				gs 'exercise', 'tier1', 1, 'stren_exp', 'vital_exp'
+				gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+				pcs_mood -= 6
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 				'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and go to the men''s room.'
@@ -78,8 +78,8 @@ if $ARGS[0] = '':
 			act 'Clean the women''s restroom (0:30)':
 				cls
 				cleWTDay = daystart
-				minut += 30
-				gs 'exercise', 'tier1', 1, 'stren_exp', 'vital_exp'
+				gs 'exercise', 'tier1', 30, 'stren_exp', 'vital_exp'
+				pcs_mood -= 6
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 				'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' room before mopping the floor.'

locations/ykamin

@@ -36,8 +36,8 @@ if pcs_sewng >= 80:
 			cls
 			minut += 60
 			sewng_exp += rand(pcs_intel/10, pcs_intel/5)
-			gobramax = pcs_sewng/50
-			gobramin = pcs_sewng/100
+			gobramax = (pcs_sewng - 70) * 6
+			gobramin = (pcs_sewng - 70) * 2
 			newgobelen += rand(gobramin,gobramax)
 			gs'stat'
 			if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'

locations/zaprF

@@ -2,10 +2,10 @@
 
 if $ARGS[0] = 'start':
 
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$metka = 'start'
+	$loc = 'zaprF'
+	$location_type = 'public_outdoors'
 	cla
-	clr
 	*clr
 	minut += 5
 	gs 'stat'
@@ -68,8 +68,6 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-
-
 	act 'Leave':
 		if cardrive = 6:
 			gt 'nord'
@@ -85,6 +83,15 @@ end
 
 if $ARGS[0] = 'toilet':
 	CLOSE ALL
+	if night_mode = 1:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(0, 0, 0)
+		lcolor = rgb(106, 90, 205)
+	else
+		fcolor = rgb(0, 0, 0)
+		bcolor = rgb(255, 255, 255)
+		lcolor = rgb(106, 90, 205)
+	end
 	cla
 	*clr
 	$locM = 'zaprF'
@@ -95,6 +102,7 @@ if $ARGS[0] = 'toilet':
 	$gt1 = 'zaprF'
 	$gt2 = 'toilet'
 	minut += 2
+	gs 'stat'
 
 	'<center><h4>Gas station toilet</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'

locations/zaprFWash

@@ -148,9 +148,6 @@ end
 
 if $ARGS[0] = 'fuckPussy':
 	money += 300
-	pcs_vag += 1
-	gs 'cum_call', ''
-	gs 'stat'
 
 	gifornot = rand (1, 100)
 	if gifornot < 40:
@@ -308,6 +305,7 @@ end
 
 
 if $ARGS[0] = 'blowjobEndMouthSwallow':
+	swallow += 1
 	'You gulp down the mouthful of sperm and then present your tongue as a proof that all of his seed is now in your belly.'
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/swallow<<i>>.jpg"></center>'
@@ -399,16 +397,14 @@ if $ARGS[0] = 'punishPussyQ':
 end
 
 if $ARGS[0] = 'punishPussy':
-	pcs_vag += 1
 	pain['vaginal'] += 4
 	gs 'cum_call', ''
-	gs 'stat'
 	i = rand(1, 5)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/punishpussy<<i>>.gif"></center>'
 	'Your pussy fully exposed, he starts fucking it ruthlessly.'
 	'After half an hour of destroying your cunt he releases his grip on you so you can finally crawl away; your aching pussy sore from the brutal penetration.'
-	pcs_horny = 0
 	gs 'arousal', 'vaginal', 30, 'sub', 'rough'
+	gs 'arousal', 'end'
 	gs 'stat'
 	abductionChance = rand(1, 100)
 	if abductionChance <= 10 or sub > 90:
@@ -422,17 +418,15 @@ end
 
 if $ARGS[0] = 'punishAnal':
 	pain['asshole'] += 6
-	pcs_ass += 1
 	gs 'cum_call', 'anus'
-	pcs_mood = 5
-	gs 'stat'
+	pcs_mood = - 15
 
-	pcs_horny = 0
 	i = rand(1, 3)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/punishanal<<i>>.gif"></center>'
 	'Your anus fully exposed, he starts fucking it ruthlessly.'
 	'After half an hour of rough assfucking he releases his grip on you so you can finally crawl away; your aching ass sore from the brutal penetration.'
-	gs 'arousal', 'anal', 30, 'sub', 'prostitute'
+	gs 'arousal', 'anal', 30, 'sub', 'rough'
+	gs 'arousal', 'end'
 	gs 'stat'
 	abductionChance = rand(1, 100)
 	if abductionChance <= 10 or sub > 90: