Ver código fonte

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

Caniculasrs 5 anos atrás
pai
commit
2626fab5f8

+ 3 - 1
locations/BelSex.qsrc

@@ -425,8 +425,10 @@ if $ARGS[0] = 'shower':
 			
 			if return_residential = 0: 
 				act 'Leave': gt 'pavCommercial'
-			else
+			elseif return_residential = 1:
 				act 'Leave': gt 'pavResidential'
+			else
+				act 'Leave': gt 'pavIndustrial'
 			end	
 		end
 	end

+ 30 - 15
locations/Gadbana.qsrc

@@ -10,7 +10,14 @@ $menu_loc = 'Gadbana'
 $menu_arg = ''
 menu_off = 0
 frost = 0
-clothesAtLocation = FUNC('lost_clothes_here','Gadbana')
+if banya_underwear = 0:
+	if $pantyworntype ! 'none' and $braworntype ! 'none':
+		banya_underwear = 1
+	else
+		banya_underwear = 2
+	end
+end
+!!clothesAtLocation = FUNC('lost_clothes_here','Gadbana')
 
 '<center><h4>bath</h4></center>'
 
@@ -24,9 +31,10 @@ if mira = 0:
 		act 'Get dressed and leave':
 			minut += 1
 			menu_off = 1
-			gs 'clothing', 'recover_lost_clothes', 'Gadbana', 1
-			gs 'underwear', 'wear'
+			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana', 1
+			if banya_underwear = 1: gs 'underwear', 'wear'
 			gs 'stat'
+			killvar 'banya_underwear'
 			gt 'Gaddvor'
 		end
 	end
@@ -40,8 +48,9 @@ if mira = 0:
 			inhib_exp += rand(0,2)
 			grandma_trouble += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
-			gs 'clothing', 'recover_lost_clothes', 'Gadbana'
+			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
 		end
@@ -53,8 +62,9 @@ if mira = 0:
 			inhib_exp += rand(0,2)
 			grandma_trouble += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
-			gs 'clothing', 'recover_lost_clothes', 'Gadbana'
+			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'
+			killvar 'banya_underwear'
 			gs 'stat'
 			act 'Continue': gt 'Gaddvor'
 		end
@@ -75,8 +85,8 @@ if mira = 0:
 					dynamic $showerdin
 					pcs_hairbsh = 0
 					pcs_makeup = 1
-					gs 'underwear', 'remove'
-					gs 'clothing', 'strip'
+					if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
+					if $clothingworntype ! 'nude': gs 'clothing', 'strip'
 
 					banaday = daystart
 
@@ -105,8 +115,9 @@ if mira = 0:
 		minut += 25
 		dynamic $showerdin
 		if frost > 0:frost = 0
-		gs 'clothing', 'strip', 'Gadbana'
-		gs 'underwear', 'remove'
+		!!gs 'clothing', 'strip', 'Gadbana'
+		gs 'clothing', 'strip'
+		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mit.jpg"></center>'
 		'You lather your body washcloth and start scrubbing your body. You rinse off the soap and start to lather the hair with the shampoo. After rising off the shampoo you are completely clean.'
@@ -121,7 +132,8 @@ if mira = 0:
 	if $clothingworntype ! 'nude':
 		act 'Remove clothes':
 			minut += 1
-			gs 'clothing', 'strip', 'Gadbana'
+			!!gs 'clothing', 'strip', 'Gadbana'
+			gs 'clothing', 'strip'
 			gs 'stat'
 			gt 'Gadbana'
 		end
@@ -220,8 +232,9 @@ else
 	act 'Undress':
 		cls
 		menu_off = 1
-		gs 'clothing', 'strip', 'Gadbana'
-		gs 'underwear', 'remove'
+		!!gs 'clothing', 'strip', 'Gadbana'
+		gs 'clothing', 'strip'
+		if $pantyworntype ! 'none' and $braworntype ! 'none': gs 'underwear', 'remove'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/village/mira/miraban.jpg"></center>'
 			'While you undress, through the corner of your eye you notice Mira removing her panties.'
@@ -259,8 +272,9 @@ else
 						cla
 						mira = 0
 						minut += 1
-						gs 'clothing', 'recover_lost_clothes', 'Gaddvor', 1
-						gs 'underwear', 'wear'
+						!!gs 'clothing', 'recover_lost_clothes', 'Gaddvor', 1
+						if banya_underwear = 1: gs 'underwear', 'wear'
+						killvar 'banya_underwear'
 						gs 'stat'
 						act 'Continue': gt 'Gaddvor'
 					end
@@ -273,9 +287,10 @@ else
 					grandma_trouble += rand(0,1)
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 					'Luckily no one saw you outside naked, but there''s a thrill in almost getting caught'
-					gs 'clothing', 'recover_lost_clothes', 'Gaddvor'
+					!!gs 'clothing', 'recover_lost_clothes', 'Gaddvor'
 					gs 'arousal', 'voyeur', 10, 'exhibitionism'
 					gs 'arousal', 'end'
+					killvar 'banya_underwear'
 					gs 'stat'
 					act 'Continue': gt 'Gaddvor'
 				end

+ 1 - 1
locations/MartinSex2.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'MartinSexPrep':
 	if pcs_vag = 0:
 		'But before either of you can make another move, a nagging thought that''s been floating around the back of your head pushes to the foreground of your mind: You are a virgin. Is Martin <i>really</i> the man you want to have your first time with? Not to mention all the risks involved if you didn''t take all necessary precautions against pregnancy...'
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
-		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...')
+		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...', ' ')
 	elseif prezik > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...')
 	elseif prezik > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 

+ 1 - 1
locations/MartinTalk.qsrc

@@ -323,7 +323,7 @@ if $ARGS[0] = '':
 				else
 					$MartinHobby = 'finger exercises'
 				end
-				'"I ' + iif(pcs_vokal>=pcs_instrmusic,'sing','play an instrument' + '."'
+				'"I '+iif(pcs_vokal >= pcs_instrmusic,'sing','play an instrument')+'."'
 				'"No wonder, with ' + iif(pcs_vokal>=pcs_instrmusic,'a voice','deft fingers') + ' like yours," Martin smiles.'
 				'"Oh, stop it," you say, flattered by his compliment. "Would you like to, I don''t know, hear something sometime?"'
 				'Martin gives you a look of pure horror. "Oh god, please no."'

+ 2 - 0
locations/bed2.qsrc

@@ -361,6 +361,8 @@ if $ARGS[0] = 'end':
 	InSleep = 0
 	slept_in = 0
 	strip_here = 0
+	if $braworntype ! 'none': gs 'bras', 'remove'
+	if $pantyworntype ! 'none':gs 'panties', 'remove'
 	if bedpanty = 1:
 		gs 'underwear', 'remove'
 	else

+ 26 - 13
locations/belgang.qsrc

@@ -38,8 +38,10 @@ if $ARGS[0] = 'workofdebt':
 			
 			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			else
+			elseif return_residential = 1: 
 				act 'Move on': gt 'pavResidential'
+			else
+				act 'Move on': gt 'pavIndustrial'
 			end
 		end
 	end
@@ -61,9 +63,11 @@ if $ARGS[0] = 'workofdebt':
 			
 			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			else
+			elseif return_residential = 1: 
 				act 'Move on': gt 'pavResidential'
-			end			
+			else
+				act 'Move on': gt 'pavIndustrial'
+			end		
 		end
 	end
 	
@@ -127,8 +131,10 @@ elseif $ARGS[0] = 'payday':
 			
 			if return_residential = 0: 
 				act 'Move on': gt 'pavCommercial'
-			else
+			elseif return_residential = 1: 
 				act 'Move on': gt 'pavResidential'
+			else
+				act 'Move on': gt 'pavIndustrial'
 			end
 		end
 	elseif money >= belgangPayWeek and money < belgangPay and belgangPayWeek > 0:
@@ -142,6 +148,10 @@ elseif $ARGS[0] = 'payday':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belymoney.jpg"></center>'
 			'You hand over the payment for this week. "That''s it, everything for this week."'
 			'He takes a moment to count the money and nods approvingly. "Very good, it''s the full amount."'
+			if slutty >= 10 and SaunaWhore = 0:
+				SaunaWhore = 1
+				'"If you ever need money, go to the sauna in the city and tell them Mr. Bely sends you. There you will have plenty of opportunities to use your ''talents''."'
+			end
 			
 			act 'Continue':
 				cla & *clr
@@ -158,9 +168,11 @@ elseif $ARGS[0] = 'payday':
 				
 				if return_residential = 0: 
 					act 'Move on': gt 'pavCommercial'
-				else
+				elseif return_residential = 1: 
 					act 'Move on': gt 'pavResidential'
-				end	
+				else
+					act 'Move on': gt 'pavIndustrial'
+				end
 			end
 		end
 	elseif belgangPayWeek <= 0:
@@ -172,7 +184,10 @@ elseif $ARGS[0] = 'payday':
 		else
 			'Vadim Bely steps out, along with several of his henchmen. He gives you a smile that you know is 100% fake and behaves amicably while he says: "Long time no see, <<$pcs_nickname>>! You are doing good. If you keep paying early, this will work out for the both of us," he says.' 
 		end
-
+		if slutty >= 10 and SaunaWhore = 0:
+				SaunaWhore = 1
+				'"If you ever need money, go to the sauna in the city and tell them Mr. Bely sends you. There you will have plenty of opportunities to use your ''talents''."'
+		end
 		act 'Continue':
 			cla & *clr
 			minut += 5
@@ -238,11 +253,13 @@ elseif $ARGS[0] = 'payday':
 				' '
 				'You owe him: <<belgangPay>> <b>₽</b>'
 				'Next week you need to pay him: <<belgangPayWeek>> <b>₽</b>'
-								
+				
 				if return_residential = 0: 
 					act 'Thank him and leave': gt 'pavCommercial'
-				else
+				elseif return_residential = 1: 
 					act 'Thank him and leave': gt 'pavResidential'
+				else
+					act 'Thank him and leave': gt 'pavIndustrial'
 				end
 			else 
 				'He frowns, abruptly cutting you off. You can see the disapproval in his eyes when you glance up. "That is very unfortunate <<$pcs_nickname>>. I had such high hopes for you," he says. "I guess we will have to find an alternative way for you to pay off your debts."'
@@ -273,9 +290,5 @@ elseif $ARGS[0] = 'payday':
 end
 
 
-
-
-
-
 --- belgang ---------------------------------
 

+ 1 - 1
locations/beverage.qsrc

@@ -455,7 +455,7 @@ if $ARGS[0] = 'afterdrink':
 	if pcs_hydra > 100:
 		$mtxt = ' while your thirst is quenched, you are starting to feel bloated, with your belly full of liquids.'
 	elseif pcs_hydra >= 80:
-		$mtxt = ' it was sufficant enough to quench your thirst.'
+		$mtxt = ' it was sufficient enough to quench your thirst.'
 	elseif pcs_hydra >= 60:
 		$mtxt = ' you could definitely go another round.'
 	elseif pcs_hydra >= 40:

+ 7 - 1
locations/brother_voyeur.qsrc

@@ -1107,7 +1107,7 @@ if $ARGS[0] = 'brother_shower_shave':
 						*nl
 						'	"No? Why would I? I like it like this?" you say.'
 						if kolka_shave_ask = daystart:
-							if kolka_shave_ask2 = daystart
+							if kolka_shave_ask2 = daystart:
 								'	Kolka frowns. "I thought you said you were going to do what I asked?"'
 								*nl
 								act'Not going to change my mind':
@@ -1335,6 +1335,12 @@ end
 if $ARGS[0] = 'brother_shower_end':
 	npc_rel['A34'] += 5
 	brother_shower_times += 1
+	if hypnoAddict = 0:
+		cumspclnt = 1
+	else
+		cumspclnt = 18
+	end
+	gs 'cum_cleanup'
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	'	The two of you now feeling fresh and clean, you turn off the water and step out.'

+ 1 - 1
locations/cikl.qsrc

@@ -373,7 +373,7 @@ if prezikmsg = 2: prezikmsg = 3
 !!	tabletkipi		: Pill Dicipline Dont take increase
 !!	tabletkicpd		: Current MC Pill Dicipline
 !!	tabletkichday	: Current day that the Birth Control is being evaluated for
-!!	tabletkicheck	: If the birth control is automatically handled
+!!	tabletkicheck	: If the birth control from shot (2) or pill (1)
 !!	tabletki		: How many packages of Birth Control Pills there are
 !!	tabletkiold		: Total number packages of expired pills
 !!	tabletkifake	: Total number packages of fake/counterfeit pills

+ 1 - 1
locations/clothing_QV.qsrc

@@ -396,7 +396,7 @@ if $ARGS[0] = 'change':
 		end
 	end
 
-	if CloBimbo = 1:'This item is considered bimbo clothing.'
+	if CloBimbo = 1 and cheatBimbo = 0:'This item is considered bimbo clothing.'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 

+ 73 - 73
locations/dateF.qsrc

@@ -31,6 +31,16 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Hi! My name is <<$pcs_nickname>>." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."'
 			'"Oh really." After a moment of silence <<$boydesc>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" she asks.'
+			act 'Don''t tell her which school':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+				'You break out into laughter, "Why would I tell you that, for all I know you could be a weird stalker."'
+				'"Did you just accuse me for being a stalker?" she asks as her voice changes to a more serious tone.'
+				'"I didn''t mean to make you upset, but don''t you thinks it''s a bit creepy for someone unknown to walk up a schoolgirl and ask what school they go to?" you answer.'
+				'<<$boydesc>> clearly upset by your question just turns around and walks away without saying another word.'
+				'"What a strange girl." you think to yourself as you watch her going away muttering something to herself.'
+				act 'Continue': gt $loc, $metka
+			end
 			act 'Tell her':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -47,6 +57,22 @@ if $ARGS[0] = 'start':
 					'"Oh, that''s great..." she stops herself. She smiles as she tells you, "Good thing I stopped myself I almost went all creepy once again."'
 					'You smile back as she gathers courage to ask you, "Since you''re not from here, what would you say to letting me show you around the town?"'
 				end
+				act 'Decline':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'As you''re talking you get a creepy feeling about this girl, "I''m sorry but I just remembered I was supposed to meet a friend."'
+					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
+					'You''re already moving away from her before she even finished her sentence not hearing what she wanted.'
+					act 'Continue': gt $loc, $metka
+				end
+				act 'Decline politely':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the girl as easy as possible.'
+					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
+					'As you move away from her, you''re glad you declined, especially after the last comment.'
+					act 'Continue': gt $loc, $metka
+				end
 				act 'I would love to':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -61,35 +87,9 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to her contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
-				end
-				act 'Decline':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'As you''re talking you get a creepy feeling about this girl, "I''m sorry but I just remembered I was supposed to meet a friend."'
-					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
-					'You''re already moving away from her before she even finished her sentence not hearing what she wanted.'
-					act 'Return': gt $loc, $metka
-				end
-				act 'Decline politely':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the girl as easy as possible.'
-					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
-					'As you move away from her, you''re glad you declined, especially after the last comment.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
-			act 'Don''t tell her which school':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-				'You break out into laughter, "Why would I tell you that, for all I know you could be a weird stalker."'
-				'"Did you just accuse me for being a stalker?" she asks as her voice changes to a more serious tone.'
-				'"I didn''t mean to make you upset, but don''t you thinks it''s a bit creepy for someone unknown to walk up a schoolgirl and ask what school they go to?" you answer.'
-				'<<$boydesc>> clearly upset by your question just turns around and walks away without saying another word.'
-				'"What a strange girl." you think to yourself as you watch her going away muttering something to herself.'
-				act 'Return': gt $loc, $metka
-			end
 		end
 	!!2) Gopnik Sveta
 	elseif gruptipe = 4:
@@ -103,6 +103,13 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'You give her a once over and then give her a amused look, "What did you say? I hope you know what you''re getting yourself into."'
 			'Not fazed by your brashness she continues on, "I know it''s just a front with girls like you. All of you just act hard but I''ve got you all figured out. Tell me this instead, what is your name?"'
+			act 'No':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+				'"How about I kick your ass instead? Now get out of here before you know what my boot feels like shoved up your ass." you reply angrily.'
+				'"Okay, okay, sheesh... take it easy." she says loudly as she''s moving away from you.'
+				act 'Continue': gt $loc, $metka
+			end
 			act 'Answer her':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -116,13 +123,6 @@ if $ARGS[0] = 'start':
 					'You snap and get up in her face, "How about I cut off your tits and add them to my collection."'
 					'She starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my tits just where they are, but if you wanted to fondle them..." She says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
 				end
-				act 'Fine':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'You give her a hard look and eye her up and down. "Fine I''m fucking bored anyways, but you''re paying."'
-					'"Good, I expected no other outcome." she says. "I''ll give it to you to decide what we should do?".'
-					gs 'dateF', 'date_choice'
-				end
 				act 'Not now':
 					*clr & cla
 					gs 'girlfriend', 'start'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'start':
 					'"I''m busy right now." You tell her and watch her become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."'
 					'She laughs at your response. "Thanks. I''ll try to make sure to call you when you''re really bored." <<$boydesc>> adds your number to her contact list.'
 					'"Don''t count on it loser." you answer.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 				act 'Fuck off!':
 					*clr & cla
@@ -138,15 +138,15 @@ if $ARGS[0] = 'start':
 					'"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.'
 					'<<$boydesc>> looks at you in shock as she was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
 					'As you''re getting more annoyed you give her a shove making her back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<$boydesc>> seeing she''s getting nowhere moves away quickly.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
+				end
+				act 'Fine':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'You give her a hard look and eye her up and down. "Fine I''m fucking bored anyways, but you''re paying."'
+					'"Good, I expected no other outcome." she says. "I''ll give it to you to decide what we should do?".'
+					gs 'dateF', 'date_choice'
 				end
-			end
-			act 'No':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-				'"How about I kick your ass instead? Now get out of here before you know what my boot feels like shoved up your ass." you reply angrily.'
-				'"Okay, okay, sheesh... take it easy." she says loudly as she''s moving away from you.'
-				act 'Return': gt $loc, $metka
 			end
 		end
 	!!3 - unattractive or average Sveta
@@ -154,6 +154,13 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair aproaching you. She is wearing <<$boyClo>>'
 		'As she nears you, she reaches out her hand for a handshake. "Hi. My name is <<$boydesc>>."'
+		act 'Refuse and walk away':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+			'Not really impressed, you decide to teach her a lesson, "Sure thing, here''s my number."'
+			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given her a totally unknown number.'
+			act 'Continue': gt $loc, $metka
+		end
 		act 'Grasp hand':
 			*clr & cla
 			minut += 5
@@ -171,6 +178,7 @@ if $ARGS[0] = 'start':
 				'"What a beautiful name and a loving smile." <<$boydesc>> tells you.'
 				'You start blushing as <<$boydesc>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
 				!!Go on date, same answer no matter what time of day or weather
+				act 'Decline':gt 'dateF', 'decline'
 				act 'I would love to':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -185,19 +193,10 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to her contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
-				act 'Decline':gt 'dateF', 'decline'
 			end
-		end
-		act 'Refuse and walk away':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-			'Not really impressed, you decide to teach her a lesson, "Sure thing, here''s my number."'
-			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given her a totally unknown number.'
-			act 'Return': gt $loc, $metka
-		end
-	!!4) Attractive Sveta 
+		end 
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a girl of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair approaching you. She is wearing <<$boyClo>>'
@@ -220,6 +219,24 @@ if $ARGS[0] = 'start':
 				'"<<$pcs_nickname>>." you answer.'
 				'"Just as I expected a beautiful name for a beautiful girl..." <<$boydesc>> quickly replies.'
 				!!Go on date, same answer no matter what time of day or weather
+				
+				act 'Decline':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
+					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
+					'The two of you say goodbye to each other.'
+					act 'Continue': gt $loc, $metka
+				end
+				
+				act 'Look at her in disgust':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
+					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
+					act 'Continue': gt $loc, $metka
+				end
+				
 				act 'Agree to a date':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -235,24 +252,7 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to her contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
-				end
-				
-				act 'Decline':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
-					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
-					'The two of you say goodbye to each other.'
-					act 'Return': gt $loc, $metka
-				end
-				
-				act 'Look at her in disgust':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
-					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
 		end
@@ -265,7 +265,7 @@ if $args[0] = 'decline':
 	'"I''m sorry but I don''t feel us clicking so I''ll have to decline."'
 	'<<$boydesc>> looks at you disappointed and then shrugs. "Well can''t blame a girl for trying, right?"'
 	'The two of you say goodbye to each other.'
-	act 'Return': gt $loc, $metka
+	act 'Continue': gt $loc, $metka
 	!!this goes back to what ever street it started on
 end
 				

+ 55 - 56
locations/dateM.qsrc

@@ -31,6 +31,16 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'"Hi! My name is <<$pcs_nickname>>." you answer. "School just ended so I was trying to figure out what to do for the rest of the day."'
 			'"Oh really." After a moment of silence <<$boydesc>> finally speaks up; "Don''t take this the wrong way but what school do you attend?" he asks.'
+			act 'Don''t tell him which school':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+				'You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."'
+				'"Did you just accuse me for a rapist?" he asks as his voice changes to a more serious tone.'
+				'"I didn''t mean to make you upset, but don''t you thinks it''s a bit strange for someone unknown to walk up a schoolgirl and ask what school they go to?" you answer.'
+				'<<$boydesc>> clearly upset by your question just turns around and walks away without saying another word.'
+				'"What a strange guy." you think to yourself as you watch him going away muttering something to himself.'
+				act 'Continue': gt $loc, $metka
+			end
 			act 'Tell him':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -61,7 +71,7 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 				act 'Decline':
 					*clr & cla
@@ -69,7 +79,7 @@ if $ARGS[0] = 'start':
 					'As you''re talking you get a creepy feeling about this guy, "I''m sorry but I just remembered I was supposed to meet a friend."'
 					'<<$boydesc>> looks at you disappointed. "Oh, that''s a shame. Could I get-..."'
 					'You''re already moving away from him before he even finished his sentence not hearing what he wanted.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 				act 'Decline politely':
 					*clr & cla
@@ -77,19 +87,9 @@ if $ARGS[0] = 'start':
 					'"I''m sorry but I''m not interested. I sort of have a boyfriend..." you answer wanting to reject the guys as easy as possible.'
 					'"That''s too bad... I should have guessed a girl in that hot outfit would be taken."'
 					'As you move away from him, you''re glad you declined, especially after the last comment.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
-			act 'Don''t tell him which school':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-				'You break out into laughter, "Why would I tell you that, for all I know you could be a rapist."'
-				'"Did you just accuse me for a rapist?" he asks as his voice changes to a more serious tone.'
-				'"I didn''t mean to make you upset, but don''t you thinks it''s a bit strange for someone unknown to walk up a schoolgirl and ask what school they go to?" you answer.'
-				'<<$boydesc>> clearly upset by your question just turns around and walks away without saying another word.'
-				'"What a strange guy." you think to yourself as you watch him going away muttering something to himself.'
-				act 'Return': gt $loc, $metka
-			end
 		end
 	!!2) Gopnik Sveta
 	elseif gruptipe = 4:
@@ -103,6 +103,13 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 			'You give him a once over and then give him a amused look, "What did you say? I hope you know what you''re getting yourself into."'
 			'Not fazed by your brashness he continues on, "I know it''s just a front with girls like you. All of you just act hard but I''ve got you all figured out. Tell me this instead, what is your name?"'
+			act 'No':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+				'"How about I kick your ass instead? Now get out of her before you know what my boot feels like shoved up your ass." you reply angrily.'
+				'"Okay, okay, sheesh... take it easy." he says loudly as he''s moving away from you.'
+				act 'Continue': gt $loc, $metka
+			end
 			act 'Answer him':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -116,13 +123,6 @@ if $ARGS[0] = 'start':
 					'You snap and get up in his face, "How about I cut off your balls and add them to my collection."'
 					'He starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my balls just where they are, but if you wanted to fondle them..." He says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
 				end
-				act 'Fine':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'You give him a hard look and eye him up and down. "Fine I''m fucking bored anyways, but you''re paying."'
-					'"Good, I expected no other outcome." he says. "I''ll give it to you to decide what we should do?".'
-					gs 'dateM', 'date_choice'
-				end
 				act 'Not now':
 					*clr & cla
 					gs 'boyfrend', 'start'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'start':
 					'"I''m busy right now." You tell him and watch him become disappointed. "But maybe I will get bored out of my skull and you will seem like a better open, so take my number and maybe I will answer if you call."'
 					'He laughs at your response. "Thanks. I''ll try to make sure to call you when you''re really bored." <<$boydesc>> adds your number to his contact list.'
 					'"Don''t count on it loser." you answer.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 				act 'Fuck off!':
 					*clr & cla
@@ -138,15 +138,15 @@ if $ARGS[0] = 'start':
 					'"Fuck off loser, I only date real men, the kinda that would kick your ass just for laughs!" you answer.'
 					'<<$boydesc>> looks at you in shock as he was not ready for you to react that way. "Well, I thought we could just have a little fun together..."'
 					'As you''re getting more annoyed you give him a shove making him back up a couple of steps. "Get the fuck out of here before I kick your ass!" <<$boydesc>> seeing he''s getting nowhere moves away quickly.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
+				end
+				act 'Fine':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'You give him a hard look and eye him up and down. "Fine I''m fucking bored anyways, but you''re paying."'
+					'"Good, I expected no other outcome." he says. "I''ll give it to you to decide what we should do?".'
+					gs 'dateM', 'date_choice'
 				end
-			end
-			act 'No':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-				'"How about I kick your ass instead? Now get out of her before you know what my boot feels like shoved up your ass." you reply angrily.'
-				'"Okay, okay, sheesh... take it easy." he says loudly as he''s moving away from you.'
-				act 'Return': gt $loc, $metka
 			end
 		end
 	!!3 - unattractive or average Sveta
@@ -154,6 +154,13 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 		'You notice a guy of <<$boybody>> height with a <<$boybod>> body and <<$boyface>> hair aproaching you. He is wearing <<$boyClo>>.'
 		'As he nears you, he reaches out his hand for a handshake. "Hi. My name is <<$boydesc>>."'
+		act 'Refuse and walk away':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+			'Not really impressed, you decide to teach him a lesson, "Sure thing, here''s my number."'
+			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given him a totally unknown number.'
+			act 'Continue': gt $loc, $metka
+		end
 		act 'Grasp hand':
 			*clr & cla
 			minut += 5
@@ -171,6 +178,7 @@ if $ARGS[0] = 'start':
 				'"What a beautiful name and a loving smile." <<$boydesc>> tells you.'
 				'You start blushing as <<$boydesc>> compliments you... "So what do you say <<$pcs_nickname>> would you like to go on a date with me?"'
 				!!Go on date, same answer no matter what time of day or weather
+				act 'Decline':gt 'dateM', 'decline'
 				act 'I would love to':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -185,18 +193,10 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
-				act 'Decline':gt 'dateM', 'decline'
 			end
 		end
-		act 'Refuse and walk away':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-			'Not really impressed, you decide to teach him a lesson, "Sure thing, here''s my number."'
-			'<<$boydesc>> quickly scribbles it down not knowing you''ve just given him a totally unknown number.'
-			act 'Return': gt $loc, $metka
-		end
 	!!4) Attractive Sveta 
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -220,6 +220,21 @@ if $ARGS[0] = 'start':
 				'"<<$pcs_nickname>>." you answer.'
 				'"Just as I expected a beautiful name for a beautiful girl..." <<$boydesc>> quickly replies.'
 				!!Go on date, same answer no matter what time of day or weather
+				act 'Decline':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
+					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
+					'The two of you say goodbye to each other.'
+					act 'Continue': gt $loc, $metka
+				end
+				act 'Look at him in disgust':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
+					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
+					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
+					act 'Continue': gt $loc, $metka
+				end
 				act 'Agree to a date':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
@@ -227,7 +242,6 @@ if $ARGS[0] = 'start':
 					'"Great!" answers <<$boydesc>> "So, what do you want to do gorgeous?".'
 					gs 'dateM', 'date_choice'
 				end
-					!!Wanting to go on date but not right now, offer phone number
 				act 'I would love to but can''t right now':
 					*clr & cla
 					gs 'boyfrend', 'start'
@@ -235,22 +249,7 @@ if $ARGS[0] = 'start':
 					'"I''m sorry, I would love to go on a date with you but I''m busy right. What if I give you my number so you can call me?"'
 					'"I say that''s a great idea. I''ll be in touch." <<$boydesc>> adds your number to his contact list.'
 					'"You better be." you say teasingly.'
-					act 'Return': gt $loc, $metka
-				end
-				act 'Decline':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'"I''m sorry but I don''t feel myself attracted to you enough and I don''t want to lead you on."'
-					'<<$boydesc>> looks at you disappointed. "Oh well, I didn''t think I had a chance but you can''t blame me for trying."'
-					'The two of you say goodbye to each other.'
-					act 'Return': gt $loc, $metka
-				end
-				act 'Look at him in disgust':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
-					'"I''m sorry, it''s good that you have all this confidence, but I''m way out of your league. There''s no way I would be caught seen out with you."'
-					'"What did you say, you little..." you''re not able to hear the rest as you walk away...'
-					act 'Return': gt $loc, $metka
+					act 'Continue': gt $loc, $metka
 				end
 			end
 		end
@@ -263,7 +262,7 @@ if $args[0] = 'decline':
 	'"I''m sorry but I don''t feel us clicking so I''ll have to decline."'
 	'<<$boydesc>> looks at you disappointed then shrugs. "Well can''t blame a guy for trying right."'
 	'The two of you say goodbye to each other.'
-	act 'Return': gt $loc, $metka
+	act 'Continue': gt $loc, $metka
 	!!this goes back to what ever street it started on
 end
 				

+ 4 - 2
locations/experiment.qsrc

@@ -257,9 +257,11 @@ if $ARGS[0] = 'testarea:questionare:2':
 	'"Are you having regular periods?"'
 
 	if tabletkicheck = 2:
-		act 'No, I am on the pill.':regper = 3 & gt 'experiment', 'testarea:questionare:3'
-		act 'No, I am on the pill. (lie)':regper = 3 & gt 'experiment', 'testarea:questionare:3'
+		act 'No, I have had the birth control shot':regper = 4 & gt 'experiment', 'testarea:questionare:3'
+	elseif tabletkicheck = 1:
+		act 'No, I am on the pill':regper = 3 & gt 'experiment', 'testarea:questionare:3'
 	else
+		act 'No, I am on the pill (lie)':regper = 3 & gt 'experiment', 'testarea:questionare:3'
 		act 'Yes'				:regper = 1  & gt 'experiment', 'testarea:questionare:3'
 		act 'Yes (lie)'			:regper = 2  & gt 'experiment', 'testarea:questionare:3'
 		act 'No'				:regper = -1 & gt 'experiment', 'testarea:questionare:3'

+ 1 - 1
locations/father.qsrc

@@ -649,7 +649,7 @@ if npc_sex['A28']!0 and fatherwantssex = 1 and mother_go = 1 and hour = 16 and n
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
     ! WD: Fix old nude variable
     if $clothingworntype = 'nude': 'You give your stepfather a lewd smile. "I figured my clothes would only get in the way Daddy, so I took them off for you."'
-    'Knowing words are not neccessary, your stepfather simply unbuttons his pants revealing his stiff cock: "<<$pcs_nickname>>, help your old man out will you?"'
+    'No words are neccessary, your stepfather simply unbuttons his pants revealing his stiff cock: "<<$pcs_nickname>>, help your old man out will you?"'
     act 'Change your mind and leave':gt $loc, $metka
     act 'Get down on your knees': gs 'fathersex', 'fatherblow4'
 end

+ 2 - 2
locations/foto_models.qsrc

@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'krystal1':
 						act 'Continue':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting/6.jpg"></center>'
-							'	You say your farewells and watch her work for a few more mintues. If nothing else, she certainly has no shame.'
+							'	You say your farewells and watch her work for a few more minutes. If nothing else, she certainly has no shame.'
 							krystal = 2
 							act 'Leave':gt 'foto','studio'
 						end
@@ -1673,7 +1673,7 @@ if jeff = 3:gt 'foto_models','jeff_3'
 if jeff = 4:gt 'foto_models','jeff_model'
 	'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/0.jpg"></center>'
 	'	Walking around the studio, you suddenly stop when you see a naked girl staring at you.'
-	'	<i>Is she a model here? Why is she starring at me like that...?</i>'
+	'	<i>Is she a model here? Why is she staring at me like that...?</i>'
 	'	Seeing you notice her, she waves you over.'
 	act 'Walk over':
 		*clr & cla

+ 1 - 1
locations/gLakeNude.qsrc

@@ -7,7 +7,7 @@ $metka = ''
 $menu_loc = 'gLakeNude'
 $menu_arg = ''
 menu_off = 0
-cls
+*clr & cla
 gs'stat'
 
 '<center><H4>Secluded beach</H4></center>'

+ 4 - 4
locations/gadukino.qsrc

@@ -527,7 +527,7 @@ if $ARGS[0] = '3':
 								miraprost += 1
 								'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost1.mp4"></video></center>'
 								'You walk up and look into the car. You see Mira giving one hell of a blowjob to her first customer. Her head is bobbing up and down on his 17cm cock.'
-								gs 'arousal', 'voyeur', 5, 'exhibitionism', 'prostitution'
+								gs 'arousal', 'voyeur', 5, 'exhibitionism'
 								gs 'stat'
 
 								act 'Continue':
@@ -561,21 +561,21 @@ if $ARGS[0] = '3':
 								miraprost += 1
 								'<center><video autoplay loop src="images/characters/village/mira/miraprost2.mp4"></video></center>'
 								'You walk up and look into the van. You see Mira showing the John her tits and rubbing her pussy. You see a hungry gleam in the guy''s eyes, which Mira returns in force.'
-								gs 'arousal', 'voyeur', 20, 'exhibitionism', 'prostitution'
+								gs 'arousal', 'voyeur', 20, 'exhibitionism'
 								gs 'stat'
 
 								act 'Continue':
 									*clr & cla
 									'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_1.mp4"></video></center>'
 									'Mira and her John jump into the back of the van and you watch as he starts fucking her wet pussy. His hand covers her mouth as she screams in ecstasy. The guy pounds his 20cm cock deep into her pussy. From Mira''s grunts of partial ecstasy, partial pain, you know the John is hitting or entering her cervix.'
-									gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
+									gs 'arousal', 'voyeur', 10, 'exhibitionism'
 									gs 'stat'
 
 									act 'Continue':
 										*clr & cla
 										'<center><video autoplay loop src="images/characters/village/mira/sex/miraprost2_2.mp4"></video></center>'
 										'You have to duck behind some bushes as they move outside the van. The guy continues to pound into Mira''s pussy until he cums...and cums...and cums. '
-										gs 'arousal', 'voyeur', 10, 'exhibitionism', 'prostitution'
+										gs 'arousal', 'voyeur', 10, 'exhibitionism'
 										gs 'stat'
 
 										act 'Continue':

+ 22 - 24
locations/gdksex.qsrc

@@ -807,8 +807,7 @@ if $ARGS[0] = 'kissing':
 end
 
 !! Scene 2: Hotel
-if $ARGS[0] = 'hotel':
-	
+if $ARGS[0] = 'hotel':	
 	menu_off = 1
 	music_loop = 0
 	close all
@@ -859,8 +858,7 @@ if $ARGS[0] = 'hotel':
 	end
 end
 			
-if $ARGS[0] = 'heating_up':
-		
+if $ARGS[0] = 'heating_up':		
 	if pcs_vag = 0:
 		act 'Tell him you''re still a virgin':
 			*clr & cla
@@ -880,6 +878,7 @@ if $ARGS[0] = 'heating_up':
 					'<<$boydesc>> gives his head a scratch, pondering the situation for a moment. Then he suggests: "How about I pay you? I''ll give you 400 <b>₽</b> for a blowjob?"'
 					'He''s already counting the money out while he says it.'
 					
+					act 'Leave the hotel':gt 'pavtrain'
 					act 'Suck him off for money':
 						*clr & cla
 						money += 400
@@ -891,7 +890,6 @@ if $ARGS[0] = 'heating_up':
 						gs 'stat'
 						gt 'gdksex', 'hotelsex', 'paid'
 					end
-					act 'Leave the hotel':gt 'pavtrain'
 				end
 				act 'Suck his cock': gt 'gdksex', 'hotelsex', 'paid'
 			else
@@ -899,6 +897,8 @@ if $ARGS[0] = 'heating_up':
 				'<<$boydesc>>''s eyes grow a bit wider, the moment you say the word ''virgin''.'
 				'"Wow, you''re a virgin? Really?" he asks, obviously very intrigued. "Can I see your pussy? Please? I haven''t seen a virgin pussy in forever... I''ll give you 200 <b>₽</b>! I just want to look at it, I promise not to touch!"'
 
+				act 'Leave the hotel':gt 'pavtrain'
+				
 				act 'Tell him it''s not going to happen':
 					*clr & cla
 					gs 'stat'
@@ -906,6 +906,7 @@ if $ARGS[0] = 'heating_up':
 					'You laugh at his confidence, it doesn''t look like anyone has said no to him before and he obviously expect you to follow his lead, but you set him straight: "Hah! I don''t think so..."'
 					'<<$boydesc>> gives his head a scratch, pondering the situation for a moment. Then he suggests: "Well in that case, how about a blowjob then? I''ll give you 400 <b>₽</b>."'
 					'He''s already counting the money out while he says it.'
+					act 'Leave the hotel':gt 'pavtrain'
 					act 'Suck him off for money':
 						*clr & cla
 						money += 400
@@ -917,7 +918,6 @@ if $ARGS[0] = 'heating_up':
 						gs 'stat'
 						gt 'gdksex', 'hotelsex', 'paid'
 					end
-					act 'Leave the hotel':gt 'pavtrain'
 				end
 				
 				act 'Show him':
@@ -933,21 +933,6 @@ if $ARGS[0] = 'heating_up':
 					'He examines your pussy for a few minutes, shining the flashlight inside you to try and catch glimpses of your hymen. "Wow, that''s so hot!" he mutters under his own breath.'
 					'Then he looks at you with a serious expression and says: "Listen, I really want to be your first. I''ll give you... 5,000 <b>₽</b>. That''s right, five thousand rubles! What do you say?"'
 					'Wow, that is a lot of money...'
-					act 'Lose your virginity for money':
-						*clr & cla
-						lose_virginity_event = 1
-						bmSEX[Tboynum] += 1
-						money += 5000
-						pav_prostitute += rand(2,6)
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/money.jpg"></center>'
-						'"Well... alright", you say softly as you extend your hand. He gives you a hearty handshake and happily says: "Deal!"'
-						'He puts a large pile of bank notes in your hand, and you quickly count it. It''s all there, as promised. When you put the money away, <<$boydesc>> eagerly pushes you down on the bed and starts taking off your top.'
-						gs 'arousal', 'foreplay', 5, 'prostitution'
-						gs 'stat'
-						act 'Continue':gt 'gdksex', 'hotelsex', 'paid'
-					end
-
 					act 'Say you''re saving yourself for marriage':
 						*clr & cla
 						pcs_dom += 1
@@ -956,6 +941,7 @@ if $ARGS[0] = 'heating_up':
 						'You laugh at his confidence, it doesn''t look like anyone has said no to him before and he obviously expect you to follow his lead, but you set him straight: "Sorry but... no. I''m saving myself for marriage, and no amount of money is going to change that!"'
 						'<<$boydesc>> scratches his head, pondering for a moment. He looks rather disappointed. Then he sighs: "Fair enough, I can respect that. I still want you though... how about a blowjob then? I''ll give you 400 <b>₽</b>?"'
 						'He''s already counting the money out while he says it.'
+						act 'Leave the hotel':gt 'pavtrain'
 						act 'Suck him off for money':
 							*clr & cla
 							money += 400
@@ -968,10 +954,22 @@ if $ARGS[0] = 'heating_up':
 							gs 'stat'
 							act 'Continue': gt 'gdksex', 'hotelsex', 'paid'
 						end
-						act 'Leave the hotel':gt 'pavtrain'
+					end
+					act 'Lose your virginity for money':
+						*clr & cla
+						lose_virginity_event = 1
+						bmSEX[Tboynum] += 1
+						money += 5000
+						pav_prostitute += rand(2,6)
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/money.jpg"></center>'
+						'"Well... alright", you say softly as you extend your hand. He gives you a hearty handshake and happily says: "Deal!"'
+						'He puts a large pile of bank notes in your hand, and you quickly count it. It''s all there, as promised. When you put the money away, <<$boydesc>> eagerly pushes you down on the bed and starts taking off your top.'
+						gs 'arousal', 'foreplay', 5, 'prostitution'
+						gs 'stat'
+						act 'Continue':gt 'gdksex', 'hotelsex', 'paid'
 					end
 				end
-				act 'Leave the hotel':gt 'pavtrain'
 			end
 		end
 	end
@@ -1449,8 +1447,8 @@ if $ARGS[0] = 'drug_user':
 	'You get up and walk over to the table, curious now. <<$boydesc>>''s spread some powder on the table and he''s working hard to split it up into equal lines. "It''s your lucky day <<$pcs_nickname>>, you''ll have the time of your life with this stuff. Everything you do just becomes so much better when you add this to the mix."'
 	'You hesitantly back up a bit, "I-I don''t know if I want to do drugs... I mean I don''t even know you and who knows what might be in that bag."'
 	'He turns to you smirking, "You followed me back to the hotel, right? Listen, believe me when I tell you that stuff is the best that you''ll ever get your hands on. A friend of mine hooked me up, he gets it from this guy in the city that really knows his stuff."'
-	act 'Try some':gt 'gdksex', 'drugs'
 	act 'Say no':gt 'gdksex', 'no drugs'
+	act 'Try some':gt 'gdksex', 'drugs'
 end
 
 if $ARGS[0] = 'drugs':

+ 44 - 52
locations/glake.qsrc

@@ -55,16 +55,34 @@ if month=1 or month=2 or month=12:
 	if pcs_icesktng>0: 'Your ice-skating skill is <<pcs_icesktng>>.'
 end
 
-if ARRSIZE('swimwear') > 0:
-		act 'Use changing room':gt 'changingroom', 'view_swim_list'
+act'Return to Pavlovsk':
+	if konki_cloth = 1:
+		cla
+		'You need to remove your skates. How are you going to walk on the streets in those?'
+		act'Back':gt'glake'
+	elseif $clothingworntype = 'swimwear':
+		cla
+		'You need to get dressed in regular clothing first.'
+		act'Return':gt'glake'
+	elseif $clothingworntype ! 'nude':
+		minut += 5
+		gt'pavResidential'
 	else
-		*nl
-		'You should probably buy some swimwear if you intend of spending time at the beach'
-		*nl
+		cla
+		'You need to wear some clothes. It''s not decent to walk the streets naked.'
+		act'Return':gt'glake'
 	end
+end
 
-if $clothingworntype = 'nude':
+if ARRSIZE('swimwear') > 0:
+	act 'Use changing room':gt 'changingroom', 'view_swim_list'
+else
+	*nl
+	'You should probably buy some swimwear if you intend of spending time at the beach'
+	*nl
+end
 
+if $clothingworntype = 'nude':
 	act'Put your clothes back on':
 		cla
 		menu_off = 1
@@ -163,7 +181,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 
 		'You walk along the beach for an hour, enjoying the feeling of the sun on your body.'
 		act 'Continue':gt'glake'
-
 	end
 
 	if $clothingworntype ! 'nude' and (pcs_inhib >= 60 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
@@ -180,7 +197,6 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 		end
 	end
 
-
 	if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
 		act 'Go swim in the lake (1:00)':
 			cla
@@ -380,37 +396,32 @@ if month = 12 or month = 1 or month = 2:
 	if hour >= 8 and hour <= 17:
 		if konki > 0 and konki_cloth ! 1:
 			act'Put your skates on':
-				cla
-				*clr
+				*clr & cla
 				menu_off = 1
 				minut += 5
 				konki_cloth = 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki0,0.jpg"></center>'
 				'You take off your shoes, and put your skates on. Now you''re ready to go ice skating.'
-				act'Done':gt'glake'
+				act 'Continue': gt'glake'
 			end
 		end
-		if konki_cloth = 1:
-			act'Skate on the ice rink': dynamic $katok_base
-		end
+		if konki_cloth = 1: act'Skate on the ice rink': gt 'glake', 'skating_start'
 	end
 end
 
-$katok_base = {
-	cla
-	*clr
+if $ARGS[0] = 'skating_start':
+	*clr & cla
 	minut += 3
 	menu_off = 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok0,'+rand(0,3)+'.jpg"></center>'
 	'You slowly make your way over to the ice rink, where a lot of people are already skating. Some people are really good at skating and basically fly around the lake on their skates, while others carefully shuffle around, doing their best to just stay on their skates without falling.'
-	act'Skate on the rink':dynamic $katok_start
 	act'Leave the rink':gt'glake'
-}
+	act'Skate on the rink': gt 'glake', 'skating'
+end
 
-$katok_start = {
-	cla
-	*clr
+if $ARGS[0] = 'skating':
+	*clr & cla
 	menu_off = 1
 	pcs_willpwr += 5
 	fat -= 1
@@ -420,7 +431,6 @@ $katok_start = {
 	react_exp += 1
 	icesktng_exp += 1
 	minut += 30
-	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok_do0,'+rand(0,7)+'.jpg"></center>'
 	if pcs_icesktng <= 10:
 		pcs_mood -= 10
@@ -434,53 +444,35 @@ $katok_start = {
 			'While you''re trying some new things, you suddenly figure out how to do a certain move properly. It definitely improves your skating skills.'
 		end
 	elseif pcs_icesktng <= 50:
-		pcs_mood+=5
+		pcs_mood += 5
 		'At long last, you finally manage to skate for a full 100 meters without falling. It''s definitely going a lot better. Some of the other regulars who have seen you struggle before notice how much better you''re doing, and congratulate you on your progress.'
 		'You become a bit more daring as you continue to ride, almost never falling any more.'
-		if rand(1,3)=1:
+		if rand(1,3) = 1:
 			icesktng_exp += 2
 			'You fall down, just this once. One of the more experienced skaters notices, and helps you up. Once you''re up on your skates again, he explains what you did wrong. His explanation will go a long way in you not making the same mistake again, and you feel like you''re a better skater for it. You thank him as you skate off, trying to apply the trick he just taught you.'
 		end
 	elseif pcs_icesktng<=70:
-		pcs_mood+=10
+		pcs_mood += 10
 		'You''re getting better and better at ice skating. You basically never fall any more, and enjoy the flow of the wind on your face as you dare to go faster and faster.'
-		if rand(1,3)=1:
+		if rand(1,3) = 1:
 			icesktng_exp += 3
 			'As you ride you watch the more experienced skaters, trying to pick up new tricks. You try to copy some of the things they are doing, and notice that those moves are indeed more efficient than how you were doing it before.'
 		end
 	else
-		pcs_mood+=15
+		pcs_mood += 15
 		'You''ve pretty much mastered ice skating now, and won''t get any better without professional training. Occasionally you do some tricks while you skate around the rink, and others admire your skills as you fly past them.'
 	end
 
+	gs'stat'
+	
 	if hour <= 17:
-		act'Skate some more':dynamic $katok_start
-		act'Leave the rink':gt'glake'
+		act 'Leave the rink': gt'glake'
+		act 'Skate some more': gt 'glake', 'skating'
 	else
-		cla
-		*clr
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/katok0,'+rand(0,3)+'.jpg"></center>'
 		'It''s too dark to go ice skating now, and the rink is closed.'
-		act'Leave':gt'glake'
-	end
-}
-
-act'Return to Pavlovsk':
-	if konki_cloth = 1:
-		cla
-		'You need to remove your skates. How are you going to walk on the streets in those?'
-		act'Back':gt'glake'
-	elseif $clothingworntype = 'swimwear':
-		cla
-		'You need to get dressed in regular clothing first.'
-		act'Return':gt'glake'
-	elseif $clothingworntype ! 'nude':
-		minut += 5
-		gt'pavResidential'
-	else
-		cla
-		'You need to wear some clothes. It''s not decent to walk the streets naked.'
-		act'Return':gt'glake'
+		act 'Leave': gt'glake'
 	end
 end
 

+ 5 - 4
locations/gschool_girls_bathroom.qsrc

@@ -387,6 +387,7 @@ if soniaPS > 0 and rand(0,1) = 0:
 	gtoilet_rand = rand(1,100)
 	if gtoilet_rand <= 30:
 		killvar 'gtoilet_rand'
+		$rand_boy = 'a boy you don''t know'
 		gt 'gschool_girls_bathroom', 'company1'
 	elseif gtoilet_rand <= 60:
 		killvar 'gtoilet_rand'
@@ -431,14 +432,14 @@ if $ARGS[0] = 'company1':
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		'Listening to <<$rand_girl>> getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hands slides down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.' 
+		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread your legs. Your hands slide down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 		*nl
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
+		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving a girl you don''t know. You add your other hand to the mix, rubbing your clit while you''re finger fucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
 		$orgasm_or = 'custom'
-		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
+		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat like you are having a seizure.'
 		gs 'arousal', 'mast', 10
 		gs 'stat'
-		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and everything is quiet once more.'
 		act 'Go to Class':gt 'gschool_lessons', 'short_break'
 	end
 end

+ 1 - 1
locations/gschool_gossip.qsrc

@@ -589,7 +589,7 @@ if $ARGS[0] = 'girls':
 		'"I kinda feel sorry for Lena, she can''t date any guys, because Vitek keeps chasing them off."'
 		'"Yeah I think she would be a lot nicer if he would just let her date a nice guy."'
 	elseif chat_rand = 17:
-		'"Have you seen the way Lera looks at Lena? She is so in love in Lena."'
+		'"Have you seen the way Lera looks at Lena? She is so in love with Lena."'
 		'"Who could miss it, what a total lesbo."'
 	elseif chat_rand = 18:
 		'"Did you see the picture of Petia''s little dick?" said with a giggle.'

+ 3 - 3
locations/gschool_lessons.qsrc

@@ -890,7 +890,7 @@ if $ARGS[0] = 'literature':
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
 			*nl
-			'Fall asleep, end of class bell wakes <<$pcs_firstname>> up.'
+			'You fell asleep and the end of class bell wakes you up.'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		end
 	end
@@ -2200,7 +2200,7 @@ if $ARGS[0] = 'music':
 		else
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
-			'Fall asleep, end of class bell wakes <<$pcs_firstname>> up.'
+			'You fell asleep and the end of class bell wakes you up.'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		end
 	end
@@ -2382,7 +2382,7 @@ if $ARGS[0] = 'art':
 		else
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/sleeping.jpg"></center>'
-			'Fall asleep, end of class bell wakes <<$pcs_firstname>> up.'
+			'You fell asleep and the end of class bell wakes you up.'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
 		end
 	end

+ 3 - 2
locations/hanters.qsrc

@@ -2863,6 +2863,7 @@ if $ARGS[0] = 'hanters_talk':
 end
 
 if $ARGS[0] = 'hantersgroupfaint':
+	*clr & cla
 	minut += 1
 	pcs_horny += rand(5,10)
 	gs 'stat'
@@ -2880,7 +2881,7 @@ if $ARGS[0] = 'hantersgroupfaint':
 			minut += 10
 			pcs_health += 100
 			pcs_mood = 100
-			pcs_willpwr +=100
+			pcs_willpwr += 100
 			hantersexnude = 0
 			forest_gopsex = 0
 			slutgosex = 0
@@ -2899,7 +2900,7 @@ if $ARGS[0] = 'hantersgroupfaint':
 			minut += 10
 			pcs_health += 100
 			pcs_mood = 100
-			pcs_willpwr +=100
+			pcs_willpwr += 100
 			shootingfaint = 0
 			hantersexnude = 0
 			forest_gopsex = 0

+ 16 - 65
locations/hantersex.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'sexafterstrip3':
 		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 		gs 'stat'
 		if pcs_sleep < 10:
-			act 'Pass out': gs 'huntersex','hantersgroupfaint'
+			act 'Pass out': gt 'hanters', 'hantersgroupfaint'
 		else
 			act 'Suck all the guys':gt 'hantersex', 'hantersgrOasi'
 		end
@@ -1648,7 +1648,7 @@ if $ARGS[0] = 'hantersgrVsO':
 	gs 'arousal', 'end'
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Sit down':gt 'hantersex', 'hantersgr1As'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgrViOas':
@@ -1717,7 +1717,7 @@ if $ARGS[0] = 'hantersgrViO':
 	gs 'stat'
 
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgrVsOia':
@@ -2053,7 +2053,7 @@ if $ARGS[0] = 'hantersgrAiO':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgrO3':
@@ -2151,7 +2151,7 @@ if $ARGS[0] = 'hantersgr2VOi':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2VO':
@@ -2231,7 +2231,7 @@ if $ARGS[0] = 'hantersgr2ViO':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2VsO':
@@ -2260,7 +2260,7 @@ if $ARGS[0] = 'hantersgr2VsO':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Sit down':gt 'hantersex', 'hantersgr1As'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2VaOs':
@@ -2360,7 +2360,7 @@ if $ARGS[0] = 'hantersgr2AOs':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Sit down':gt 'hantersex', 'hantersgr1As'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2AiO':
@@ -2390,7 +2390,7 @@ if $ARGS[0] = 'hantersgr2AiO':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2AOi':
@@ -2413,7 +2413,7 @@ if $ARGS[0] = 'hantersgr2AOi':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Lie on your back':gt 'hantersex', 'hantersgr1Ai'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2AsO':
@@ -2442,7 +2442,7 @@ if $ARGS[0] = 'hantersgr2AsO':
 	minut -= 5
 	gs 'stat'
 	if pcs_sleep >= 10:act 'Sit down':gt 'hantersex', 'hantersgr1As'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'hantersgr2DPVaAs':
@@ -2572,55 +2572,6 @@ if $ARGS[0] = 'hantersgrO1':
 	act 'Pass out': gt 'hantersex', 'hantersGrEnd'
 end
 
-! loss of consciousness
-if $ARGS[0] = 'hantersexfaint':
-	*clr & cla
-	minut += 1
-	pcs_horny += rand(5,10)
-	gs 'stat'
-
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersgroupfaint.jpg"></center>'
-	'A sudden unbearable pain blocked your vision, the world spun and you collapsed...'
-
-	if hantersRape = 4 or hantdanceslut = 4:
-		act 'Wake up':
-			*clr & cla
-			minut += 10
-			pcs_health += 100
-			pcs_mood = 100
-			pcs_willpwr +=100
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersgroupfaint1.jpg"></center>'
-			'You woke up to the feeling of water pouring over you...'
-			'-Well, <<$pcs_nickname>>, you''re still alive, right? - asked Andrei as you came to.'
-			'You weakly shook her head yes.'
-			'-Okay. Go to the hut and rest." he said and walked away.'
-
-			act 'Further': gt $loc, $metka
-		end
-	else
-		act 'Wake up':
-			*clr & cla
-			minut += 10
-			pcs_health += 100
-			pcs_mood = 100
-			pcs_willpwr +=100
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hantersgroupfaint2.jpg"></center>'
-			'You woke up from a light pat on the cheeks...'
-			'-Well, <<$pcs_nickname>>, you''re still alive, right? - asked Andrei as you came to.'
-			'You weakly shook her head yes.'
-			'-You scared us. You got so fucked up last night. Go to the hut and rest." he said and walked away.'
-
-			gs 'arousal', 'end'
-			gs 'stat'
-			act 'Further': gt'swamphouse'
-		end
-	end
-end
-
 if $ARGS[0] = 'hantersGrEnd':
 	*clr & cla
 	minut += 1
@@ -2741,7 +2692,7 @@ if $ARGS[0] = 'rng_8':
 	if pcs_sleep >= 10 and hantsexa = 9 and hantsexb = 5:act 'Lie on your back':gt 'hantersex', 'hantersgrAiO'
 	if pcs_sleep >= 10 and hantsexa = 9 and hantsexb < 5:act 'Lie on your back':gt 'hantersex', 'hantersgrAOsa'
 	if pcs_sleep >= 10 and hantsexa = 10:act 'Lie on your back':gt 'hantersex', 'hantersgrO3'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'rng_9':
@@ -2753,7 +2704,7 @@ if $ARGS[0] = 'rng_9':
 	if pcs_sleep >= 10 and hantsexa = 2 and hantsexb < 5:act 'Lie on your back':gt 'hantersex', 'hantersgr2AOs'
 	if pcs_sleep >= 10 and hantsexa = 3 and hantsexb <= 5:act 'Sit down':gt 'hantersex', 'hantersgr2AOi'
 	if pcs_sleep >= 10 and hantsexa = 3 and hantsexb > 5:act 'Sit down':gt 'hantersex', 'hantersgr2AsO'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'rng_10':
@@ -2765,7 +2716,7 @@ if $ARGS[0] = 'rng_10':
 	if pcs_sleep >= 10 and hantsexa = 2 and hantsexb <= 4:act 'Get on all fours':gt 'hantersex', 'hantersgr2ViOa'
 	if pcs_sleep >= 10 and hantsexa = 2 and hantsexb > 4:act 'Get on all fours':gt 'hantersex', 'hantersgr2ViO'
 	if pcs_sleep >= 10 and hantsexa = 3:act 'Lie on your back':gt 'hantersex', 'hantersgrO2'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'rng_11':
@@ -2775,7 +2726,7 @@ if $ARGS[0] = 'rng_11':
 	if pcs_sleep >= 10 and hantsexa = 1 and hantsexb <= 4:act 'Lie on your side':gt 'hantersex', 'hantersgr2VaO'
 	if pcs_sleep >= 10 and hantsexa = 2 and hantsexb > 5:act 'Sit down':gt 'hantersex', 'hantersgr2DPVaAs'
 	if pcs_sleep >= 10 and hantsexa = 2 and hantsexb <= 5:act 'Sit down':gt 'hantersex', 'hantersgr2DPVaA'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 if $ARGS[0] = 'rng_12':
@@ -2783,7 +2734,7 @@ if $ARGS[0] = 'rng_12':
 	if pcs_sleep >= 10 and hantsexa = 1:act 'Sit down':gt 'hantersex', 'hantersgr1Va'
 	if pcs_sleep >= 10 and hantsexa = 2:act 'Lie on your back':gt 'hantersex', 'hantersgrO1'
 	if pcs_sleep >= 10 and hantsexa = 3:act 'Sit down':gt 'hantersex', 'hantersgr1Aa'
-	if pcs_sleep < 10:act 'Pass out':gt 'hantersex', 'hantersexfaint'
+	if pcs_sleep < 10:act 'Pass out':gt 'hanters', 'hantersgroupfaint'
 end
 
 

+ 24 - 0
locations/pavIndustrial.qsrc

@@ -93,5 +93,29 @@ act 'Wait':gs 'obj_din', 'wait'
 
 if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 
+if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week = 7:
+	menu_off = 1
+	cla & *clr
+	daybelisex = daystart
+	minut += 5
+	gs 'stat'
+	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
+	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
+
+	act 'Go to the jeep': return_residential = 2 & gt 'belgang', 'payday' 	
+elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
+	menu_off = 1
+	cla & *clr
+	daybelisex = daystart
+	minut += 5
+	gs 'stat'
+	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
+	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang. Your heart skips a beat as you notice one of them pointing at you, and soon they pull over.'
+		
+	act 'Go to the jeep': return_residential = 2 & gt 'belgang', 'workofdebt' 	
+end
+
 --- pavCommercial ---------------------------------
 

+ 72 - 79
locations/postmaster.qsrc

@@ -6,7 +6,6 @@
 !!postlate = (0-15), how often you come back to the post office after 15:15. You get fired if this counter hits 15)
 !!postburn = (0-1, whether hoodlums tampered with your mail. Gets you fired if yes)
 
-
 if $ARGS[0] = 'start':
 	menu_off = 1
 	gs 'stat'
@@ -16,7 +15,7 @@ if $ARGS[0] = 'start':
 	act 'Leave': gt 'postoffice', 'start'
 	if postjobQW = 0:
 		act 'Ask for work':
-			cls
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
@@ -24,15 +23,7 @@ if $ARGS[0] = 'start':
 			'Just when you were about to turn around to leave, he ponders: "Actually, Aleksiy has been mentioning he wants to spend more time with his sick daughter on weekends. Maybe... come back here, girl."'
 			'He takes another good look at you and seems to be in deep thought for a moment, before humming contently.'
 			'"Alright, I''ll give you a chance to prove yourself. You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week," he offers.'
-			''
-			act 'Accept the job':
-				cla
-				postjobQW = 2
-				'"That sounds great, thank you!" you smile at him. That''s good money!'
-				'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out. Our post office has a damn near perfect record for deliveries, and I intend to keep it that way."'
-				'He quickly records your personal information and then nods you off, before returning to his work.'
-				act 'Leave him alone': gt 'postoffice', 'start'
-			end	
+			*nl
 			act 'Decline':
 				cla
 				postjobQW = 1
@@ -41,16 +32,30 @@ if $ARGS[0] = 'start':
 				'He then nods you off, before returning to his work.'
 				act 'Leave him alone':gt 'postoffice', 'start'
 			end
+			act 'Accept the job':
+				cla
+				postjobQW = 2
+				'"That sounds great, thank you!" you smile at him. That''s good money!'
+				'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out. Our post office has a damn near perfect record for deliveries, and I intend to keep it that way."'
+				'He quickly records your personal information and then nods you off, before returning to his work.'
+				act 'Leave him alone': gt 'postoffice', 'start'
+			end	
 		end
 	elseif postjobQW = 1:
 !!intermediate if you refused the job initially
-		cla
-		*clr
+		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 		'"Wait... weren''t you here before?" the postmaster asks when he sees your face. "Right, you were here about that Saturday job! It''s still available if you want it?"'
 		'When you ask him about the details, he reminds you: "You can deliver some urgent letters and packages on Saturday afternoon. You''ll get the same pay Aleksiy gets, assuming you do a good job. 450 <b>₽</b> total, for about three hours of work - from 12:00 to roughly 15:00. If you do well, you can do it every week."'
-		''
+		*nl
+		act 'Decline':
+			cla
+			'"Sorry... but I don''t know..." you tell him.'
+			'The postmaster looks at you a bit confused, wondering what other job you expected to get. He shrugs: "Still? Well, okay. If you''re not interested in this job, there''s no point in visiting me again... I won''t have anything else. Let me know if you change your mind. Until then, stop wasting my time."'
+			'He then nods you off, before returning to his work.'
+			act 'Leave him alone':gt 'postoffice', 'start'
+		end
 		act 'Accept the job':
 			cla
 			postjobQW = 2
@@ -59,18 +64,10 @@ if $ARGS[0] = 'start':
 			'He then nods you off, before returning to his work.'
 			act 'Leave him alone':gt 'postoffice', 'start'
 		end	
-		act 'Decline':
-			cla
-			'"Sorry... but I don''t know..." you tell him.'
-			'The postmaster looks at you a bit confused, wondering what other job you expected to get. He shrugs: "Still? Well, okay. If you''re not interested in this job, there''s no point in visiting me again... I won''t have anything else. Let me know if you change your mind. Until then, stop wasting my time."'
-			'He then nods you off, before returning to his work.'
-			act 'Leave him alone':gt 'postoffice', 'start'
-		end
 	elseif postjobQW = 2 and postworkday ! daystart:
 !!when you go to work on Saturday, first time
 		if week = 6 and hour = 11:
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Ah good, you''re here!" the postmaster smiles when you enter the post office. "And right on time, too. Please, follow me."'
 			'He guides you to the back room where a number of small packages and letters are packed into a bag.'
@@ -79,16 +76,16 @@ if $ARGS[0] = 'start':
 			'"Oh, before I forget: you might want to avoid certain streets," he warns you. "I''ve marked them on this map. You wouldn''t be the first to get robbed by hoodlums hoping to find something valuable in the packages. And you wouldn''t be the first to get a beating, when they get angry there was nothing of value in your bag. Anyway, avoid these areas and you should be fine."'
 			'He hands you an area map, with a bunch of streets and plazas marked. He has drawn out the best route to take today, too.'
 			act 'Begin with the deliveries':
-				cls
+				*clr & cla
 				minut += 60
 				postworkday = daystart
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
 				'The first hour goes by fairly fast. The postmaster was right, this is fairly easy. You notice you''re losing a lot of time by avoiding the streets he told you to, though. You could easily save half an hour, if not more, by just cutting through them when you need to.'
 				'Then again... he wouldn''t warn you and go through the trouble of drawing out a map, if it wasn''t important!'
-				''
+				*nl
 				act 'Stick to the ''safe'' streets':
-					cls
+					*clr & cla
 					minut += 115
 					money += 500
 					gs'stat'
@@ -98,14 +95,6 @@ if $ARGS[0] = 'start':
 					'"You managed to deliver all of them? That''s great!" the postmaster beams as you put the empty bag back where it belongs. He seems very relieved this experiment worked out well.'
 					'He hands you your pay right away, with another 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "So... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 					'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
-					act 'Accept the job':
-						cla
-						postjobQW = 4
-						'You tell him you want to work again next Saturday.'
-						'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
-
-						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
-					end
 					act 'You''re not sure':
 						cla
 						postjobQW = 3
@@ -113,11 +102,19 @@ if $ARGS[0] = 'start':
 						'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re not coming."'
 						'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
+						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+					end
+					act 'Accept the job':
+						cla
+						postjobQW = 4
+						'You tell him you want to work again next Saturday.'
+						'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
+
 						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 					end
 				end		
 				act 'Use the more dangerous shortcuts to be done faster':
-					cls
+					*clr & cla
 					minut += 70
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
@@ -126,7 +123,7 @@ if $ARGS[0] = 'start':
 					'You''re done almost an hour faster than planned, and it''s only 14:10 when you return to the postmaster.'
 					'He gives you a suspecting look and shakes his head, saying: "There''s no way you''d be back already if you listened to what I said. You ignored my warning, didn''t you?"'
 					act 'Be honest and admit that you did':
-						cls
+						*clr & cla
 						money += 500
 						gs'stat'
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
@@ -134,17 +131,7 @@ if $ARGS[0] = 'start':
 						'He lets out an exasperated sigh but nods: "I drew out that map for your safety, girl... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
 						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
 						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
-						''
-						act 'Accept the job':
-							cla
-							postjobQW = 4
-							minut += 2
-							gs'stat'
-							'You tell him you want to work again next Saturday.'
-							'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
-
-							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
-						end
+						*nl
 						act 'You''re not sure':
 							cla
 							postjobQW = 3
@@ -156,16 +143,6 @@ if $ARGS[0] = 'start':
 
 							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 						end
-					end
-					act 'Lie, saying you''re just a fast worker':
-						cls
-						money += 500
-						gs'stat'
-						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
-						'The postmaster sees right through your lie, but can''t help but laugh: "You kids and your youthful hubris! I drew out that map for your safety... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
-						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
-						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
-						''
 						act 'Accept the job':
 							cla
 							postjobQW = 4
@@ -176,6 +153,17 @@ if $ARGS[0] = 'start':
 
 							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 						end
+
+					end
+					act 'Lie, saying you''re just a fast worker':
+						*clr & cla
+						money += 500
+						gs'stat'
+						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
+						'The postmaster sees right through your lie, but can''t help but laugh: "You kids and your youthful hubris! I drew out that map for your safety... but fine. As long as you do a good job and everyone gets their mail on time, I won''t ask how you do it. Just be careful, okay?"'
+						'He hands you the pay for your work, the full amount despite you being done quicker. You even find 50 <b>₽</b> extra. "From Aleksiy, he says thanks for his first Saturday off in months! He and his little girl dropped by earlier, he looked so happy!" he explains. "Anyway... as far as I''m concerned, you got the job for every weekend. What do you say, same time next Saturday?"'
+						'You can do this work every Saturday from now on, from 12:00 to roughly 15:00.'
+						*nl
 						act 'You''re not sure':
 							cla
 							postjobQW = 3
@@ -185,6 +173,16 @@ if $ARGS[0] = 'start':
 							'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re passing up on the offer."'
 							'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
+							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+						end
+						act 'Accept the job':
+							cla
+							postjobQW = 4
+							minut += 2
+							gs'stat'
+							'You tell him you want to work again next Saturday.'
+							'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
+
 							act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 						end
 					end
@@ -192,7 +190,7 @@ if $ARGS[0] = 'start':
 			end
 !!if you''re at the post office when it''s not working time
 		else
-			cls
+			*clr & cla
 			minut += 2
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
@@ -205,35 +203,34 @@ if $ARGS[0] = 'start':
 		end
 	elseif postjobQW = 3:
 !!if you said you''re not sure about taking the regular job and refuse it the first time
-		cla
-		*clr
+		*clr & cla
 		minut += 2
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 		'The postmaster looks at you expectantly when he sees you come back in, and asks: "Hi <<$pcs_firstname>>! We could really use you on Saturdays... I hope you''re here with good news?"'
 		'You can deliver priority mail and packages every Saturday from now on, from 12:00 to roughly 15:00.'
-		''
-		act 'Accept the job':
-			cla
-			postjobQW = 4
-			'You tell him you''ll take the job.'
-			'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you on Saturday!" he says, shaking your hand.'
-
-			act 'Leave the postmaster''s office':gt 'postoffice', 'start'
-		end
+		*nl
 		act 'Decline the job':
 			cla
 			postjobQW = 5
 			'"I''ve given it some thought, but no. Sorry, you''ll have to find someone else," you tell the postmaster.'
 			'"That''s too bad, <<$pcs_firstname>>, you could''ve been a great post girl! Well... thanks for letting me know," he mutters, clearly disappointed. "My door is always open for you, if you change your mind."'
 	
+			act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+		end
+		act 'Accept the job':
+			cla
+			postjobQW = 4
+			'You tell him you''ll take the job.'
+			'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you on Saturday!" he says, shaking your hand.'
+
 			act 'Leave the postmaster''s office':gt 'postoffice', 'start'
 		end
 	elseif postjobQW = 4:
 		if week ! 6:
 !!if you don''t want to work next Saturday
 			act 'Tell him you can''t work this coming Saturday':
-				cls
+				*clr & cla
 				postjobQW = 5
 				minut += 2
 				gs'stat'
@@ -247,8 +244,7 @@ if $ARGS[0] = 'start':
 			end
 		elseif hour < 11:
 !!if it''s Saturday but you''re early
-			cla
-			*clr
+			*clr & cla
 			minut += 2
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
@@ -257,8 +253,7 @@ if $ARGS[0] = 'start':
 			act 'Leave him alone':gt 'postoffice', 'start'
 		elseif hour > 11 and postworkday ! daystart:
 !!if it''s Saturday but you''re late	
-			cla
-			*clr
+			*clr & cla
 			minut += 2
 			postworkday = daystart
 			gs'stat'
@@ -269,8 +264,7 @@ if $ARGS[0] = 'start':
 			act 'Leave his office':gt 'postoffice', 'start'
 		elseif hour = 11 and postworkday ! daystart:
 !!if it''s Saturday and you''re ready to work
-			cla
-			*clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Hi there, <<$pcs_firstname>>!" the postmaster smiles when you enter the post office. "Right on time. Please, follow me."'
 		
@@ -279,7 +273,7 @@ if $ARGS[0] = 'start':
 	elseif postjobQW = 5:
 !!if you want to work after all next Saturday
 		act 'Tell him you can work this coming Saturday after all':
-			cls
+			*clr & cla
 			postjobQW = 4
 			minut += 2
 			gs'stat'
@@ -294,8 +288,7 @@ if $ARGS[0] = 'start':
 		end
 	elseif postjobQW = 999:
 !!you were fired, the postmaster won''t see you again
-		cla
-		*clr
+		*clr & cla
 		'"You! Get out of here!" the postmaster shouts angrily when you enter his office. "There''s no job for you! Not now, not ever! That screw-up of yours ruined our perfect record..."'
 		'You try to talk to the postmaster and explain what happened, but he''s simply not interested in whatever it is you have to say. It seems very unlikely that he''d consider hiring you again.'
 

+ 32 - 42
locations/postoffice.qsrc

@@ -1,13 +1,15 @@
 # postoffice
 
 if $ARGS[0] = 'start':
-	cls
+	*clr & cla
 	$menu_loc = 'postoffice'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
 	$postloc = ''
 
+	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+	
 	if (hour >= 9 and hour <= 10) or (hour >= 15 and hour <=16):
 				
 		'<center><b><font color="maroon">Post Office</font></b></center>'
@@ -23,7 +25,7 @@ if $ARGS[0] = 'start':
 	
 		if exhibitionist_lvl > 2:
 			act 'Flash both your tits and your pussy to skip the line':
-				cls
+				*clr & cla
 				menu_off = 1
 				gs 'flash', 'full', 'inside', 5
 				gs 'stat'
@@ -34,7 +36,7 @@ if $ARGS[0] = 'start':
 
 		if exhibitionist_lvl > 1:
 			act 'Flash your pussy to skip the line':
-				cls
+				*clr & cla
 				menu_off = 1
 				gs 'flash', 'pussy', 'inside', 5
 				gs 'stat'
@@ -45,7 +47,7 @@ if $ARGS[0] = 'start':
 
 		if exhibitionist_lvl > 0 or pcs_inhib >= 45:
 			act 'Flash your tits to skip the line':
-				cls
+				*clr & cla
 				menu_off = 1
 				gs 'flash', 'tits', 'inside', 5
 				gs 'stat'
@@ -56,7 +58,7 @@ if $ARGS[0] = 'start':
 		
 		if exhibitionist_lvl > 0:
 			act 'Suggest a blowjob in exchange for jumping the queue':
-				cls
+				*clr & cla
 				menu_off = 1
 				if cumloc[12] = 0 and cumloc[11] = 0:
 					pcs_throat += 1
@@ -68,7 +70,7 @@ if $ARGS[0] = 'start':
 					gs 'stat'
 				
 					act 'Cum on your face':
-						cls
+						*clr & cla
 						if pcs_haircol = 0:
 							$cum_face_image = 'black/' + rand(1,23)
 						elseif pcs_haircol = 1:
@@ -91,7 +93,7 @@ if $ARGS[0] = 'start':
 					end
 
 					act 'Cum in your mouth':
-						cls
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/sex/cumlip.jpg"></center>'
 						'The man cums inside your mouth.'
 						spafinloc = 12
@@ -128,13 +130,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if bankloc = 0:
-		act 'Go to Postmaster''s Office':
-			gt 'postmaster', 'start'
-		end
-	end
-
-	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+	if bankloc = 0: act 'Go to Postmaster''s Office': gt 'postmaster', 'start'
 end
 
 if $postloc = 'counter':
@@ -147,6 +143,8 @@ if $postloc = 'counter':
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
 	'The counter, its boring here.'
 	
+	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+	
 	if bankAccount = 1 and money > 0:
 		act 'Deposit money to your bank account':
 			cla
@@ -166,9 +164,8 @@ if $postloc = 'counter':
 
 			'"Is there anything else I can do for you?"'
 
-			act 'Yes':$postloc = 'counter' & gt 'postoffice'
-
 			act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
+			act 'Yes':$postloc = 'counter' & gt 'postoffice'
 		end
 	end
 	
@@ -204,11 +201,11 @@ if $postloc = 'counter':
 	end
 
 	if used_pattest > 0:
-		act 'Send paternity test (20.000<b>₽</b>)':
+		act 'Send paternity test (20.000 <b>₽</b>)':
 			menu_off = 1
 			if money >= 20000:
 				dynamic $send_test
-				cls
+				*clr & cla
 				gs 'stat'
 				'You pay the fee of the testing, then you mail your used paternity test to the testing labor in Saint Petersburg with the copy of your receipt of payment. You will get answer in SMS withing a week.'
 			else
@@ -219,7 +216,7 @@ if $postloc = 'counter':
 	end
 	
 	act 'Check received mail':
-		cls
+		*clr & cla
 		menu_off = 1
 		gs 'stat'
 		minut += 5
@@ -264,9 +261,7 @@ if $postloc = 'counter':
 
 	'<tr><td align="center"><<n>> hour internet card </td><td align="right">(you have <<internet>> hours of internet access) </td><td align="right"><<$buy_link>> </td><td align="left">for <<price>> <b>₽</b></td></tr>'
 
-	if i < 4:
-		jump 'loopcard'
-	end
+	if i < 4: jump 'loopcard'
 
 	'</table></center>'
 	
@@ -307,7 +302,7 @@ if $postloc = 'counter':
 !!	if askWork = 0 and bankloc = 0:	
 !!		act 'Ask for work':
 	
-!!			cls
+!!			*clr & cla
 !!			minut += 5
 !!			gs 'stat'
 			
@@ -319,11 +314,8 @@ if $postloc = 'counter':
 !!askWork += 1
 !!		end
 !!	end
-
-	act 'Leave':$postloc = 'leave' & gt 'postoffice'
 end
 
-
 if $postloc = 'leave':
 	minut += 3
 	killvar '$postloc'
@@ -336,8 +328,7 @@ end
 
 !! Not used for Pav, maybe use for city?
 if $postloc = 'post_off':
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	minut += 30
 	gs 'stat'
@@ -347,9 +338,11 @@ if $postloc = 'post_off':
 	!!'<center><img src="images/system/image_needed.png"></center>'
 	'Behind his desk, a man of about 50 is busy with some paperwork. He''s dressed quite sharply, and you had never expected the postmaster would be this good looking.'
 
+	act 'Exit office':gt'postoffice', 'start'
+	
 	if post_wrk = 0:
 		act 'Ask for work':
-			cls
+			*clr & cla
 			minut += 15
 			gs 'stat'
 			!!Placeholder text
@@ -358,8 +351,17 @@ if $postloc = 'post_off':
 			'You smile and shake your head: "No, no problem. I am looking for a job, I hear you are often looking for workers?"'
 			'You can feel his eyes exploring your body for a moment before he responds: "Yes, we are! We currently only have a part-time vacancy, for sorting the mail. You would be working between these and these hours, give or take. Does that sound good to you?"'
 		
+			act'"Sorry, not interested"':
+				*clr & cla
+				gs 'stat'
+				'"I need to think about it if it''s okay."'
+				'"Sure <<$pcs_nickname>>, come back when you''ve made up your mind."'
+
+				act'Exit office':gt'postoffice', 'start'
+			end
+		
 			act'"That sounds great!"':
-				cls
+				*clr & cla
 				post_wrk += 1
 				gs 'stat'
 				!!Placeholder text
@@ -370,20 +372,8 @@ if $postloc = 'post_off':
 				
 				act'Exit Office':gt'postoffice', 'start'
 			end
-
-			act'"Sorry, not interested"':
-				cls
-				gs 'stat'
-				'"I need to think about it if it''s okay."'
-				'"Sure <<$pcs_nickname>>, come back when you''ve made up your mind."'
-
-				act'Exit office':gt'postoffice', 'start'
-			end
 		end
 	end
-
-	act 'Exit office':gt'postoffice', 'start'
-
 end
 
 --- postoffice ---------------------------------

+ 1 - 1
locations/preALT.qsrc

@@ -202,7 +202,7 @@ if $ARGS[0] = 'Cursed Schoolgirl Start 2':
 									gs 'obj_din', 'old'
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/system/magicschoolgirl.jpg"></center>'
-									'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad other issues that might pop up and all with the added spice of magic to keep things interesting!'
+									'Welcome to the Cursed Schoolgirl version! Guide <<$pcs_nickname>> through her school life, relationships and myriad of other issues that might pop up and all with the added spice of magic to keep things interesting!'
 									act 'Begin!':
 										if start_location = 2:
 											gt 'Gadhouse', 'intro'

+ 1 - 1
locations/trFatherMisha.qsrc

@@ -457,7 +457,7 @@ if $ARGS[0] = '':
 					gs 'arousal', 'kiss_give', 5, 'incest'
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/mikhail/terminal/trfatherqw_39.jpg"></center>'
-					'Without any hesitation, you jump up from your chair, quickly walking towards your father. You grab his face and lean in for a kiss. Your father is shocked at first but it doesn''t take long time before his tongue is in your mouth...'
+					'Without any hesitation, you jump up from your chair, quickly walking towards your father. You grab his face and lean in for a kiss. Your father is shocked at first, but it doesn''t take long for him to get into it and after a short time neither of you is holding themselves back. It feels good to let the feelings free finally. All the tension that was there between you two has disappeared. While you enjoy the moment, your arousal keeps building...'
 					'As you make out none of you is holding back. You''re happy that you don''t have to hold back anymore. All of the animosity disappears and you let yourself enjoy the moment.'
 					'Your arousal is building, knowing this is forbidden but you can''t help yourself. The forbidden attraction between a father and daughter is too arousing to ignore...'
 					trfatherMishaQW = 6

+ 1 - 1
locations/train_incidental.qsrc

@@ -411,7 +411,7 @@ end
 if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/shared/train/sex/leskuni.mp4" ></video></center>'
-	'As you get off the train and walk into the train station, you are greeted by a very unusual sight. One girl is sitting on a bench with her legs spread wide, while another girl is kneeling down on the floor, with her face buried in her crotch. A few people are watching the two girls, but most people are just ignoring it, you watch the two of them feeling yourself getting aroused. Sadly as you make your way towards the exit you can no longer seem them, but you can still hear them in the distance.'
+	'As you get off the train and walk into the train station, you are greeted by a very unusual sight. One girl is sitting on a bench with her legs spread wide, while another girl is kneeling down on the floor, with her face buried in her crotch. A few people are watching the two girls, but most people are just ignoring it, you watch the two of them feeling yourself getting aroused. Sadly as you make your way towards the exit you can no longer see them, but you can still hear them in the distance.'
 	act 'Continue': gt $loc, $metka
 end
 

+ 2 - 2
locations/vanrPar.qsrc

@@ -31,9 +31,9 @@ if $ARGS[0] = '':
 	gs 'din_van', 'private'
 
 	if vanr_lock = 0:
-		act'<font color = maroon><b>Close the latch on the door</b></font>':vanr_lock = 1 & gt 'vanrPar'
+		act'<b>Close the latch on the door</b>':vanr_lock = 1 & gt 'vanrPar'
 	elseif vanr_lock = 1:
-		act'<font color = maroon><b>Open the latch on the door</b></font>':vanr_lock = 0 & gt 'vanrPar'
+		act'<b>Open the latch on the door</b>':vanr_lock = 0 & gt 'vanrPar'
 	end
 end
 

+ 3 - 3
locations/zaprFWash.qsrc

@@ -103,7 +103,7 @@ if $ARGS[0] = 'titsQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
 	
-	'Want to earn some more cash, girl? Show me your tits. I''ll give you 100 <b>₽</b>. It''s easy money.'
+	'Want to earn some more cash, girl? Show me your tits. I''ll give you 50 <b>₽</b>. It''s easy money.'
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if exhibitionist_lvl > 0 or pcs_inhib >= 35 or pcs_horny >= 40: act 'Agree and show him your tits':gt 'zaprFWash', 'titsFlash', 'Paid', 'Question'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'assQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
 	
-	'What a nice ass you have there. Let me see it. Will 100 <b>₽</b> convince you to show it to me?'
+	'What a nice ass you have there. Let me see it. Will 50 <b>₽</b> convince you to show it to me?'
 	
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if exhibitionist_lvl > 0 or pcs_horny >= 60: act 'Agree and show him your ass':gt 'zaprFWash', 'assFlash', 'Paid', 'Question'
@@ -125,7 +125,7 @@ if $ARGS[0] = 'pussyQ':
 	i = rand(1, 4)
 	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<i>>.jpg"></center>'
 	
-	'You look like a cool girl. Let me see your pussy. I''ll only look for 100 <b>₽</b>.'
+	'You look like a cool girl. Let me see your pussy. I''ll give you 50 <b>₽</b>.'
 		
 	! inhibition or exhibitionism requirements needed to accept the offer or just have fun with him
 	if exhibitionist_lvl > 1 or pcs_horny >= 80: act 'Agree and show him your pussy':gt 'zaprFWash', 'pussyFlash', 'Paid', 'Question'