Browse Source

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

Mike Greene 5 years ago
parent
commit
cf099b0266

+ 41 - 33
locations/etoexhib.qsrc

@@ -304,7 +304,7 @@ if $ARGS[0] = 'pos9':
 		'Work:"For some shoveling work, 3000<b>₽</b>."'
 		'Work:"For some shoveling work, 3000<b>₽</b>."'
 
 
 		act 'Agree':
 		act 'Agree':
-			cls
+			*clr & cla
 			etoexhib = 11
 			etoexhib = 11
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/suburban/dachastroy.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/suburban/dachastroy.jpg"></center>'
@@ -373,7 +373,7 @@ if $ARGS[0] = 'pos12':
 		'Work:"Sorry young lady. Some motivation would help us work harder."'
 		'Work:"Sorry young lady. Some motivation would help us work harder."'
 
 
 		act 'Decline':
 		act 'Decline':
-			cls
+			*clr & cla
 			etoexhib = 15
 			etoexhib = 15
 			temp = daystart
 			temp = daystart
 			gs 'stat'
 			gs 'stat'
@@ -384,7 +384,7 @@ if $ARGS[0] = 'pos12':
 		end
 		end
 
 
 		act 'Accept and give half the amount':
 		act 'Accept and give half the amount':
-			cls
+			*clr & cla
 			money -= 1500
 			money -= 1500
 			etoexhib = 14
 			etoexhib = 14
 			temp = daystart
 			temp = daystart
@@ -708,7 +708,7 @@ if $ARGS[0] = 'pos19':
 	'The Lyceum entrance hall. It''s pretty clean and quiet. There is a desk and office for the personnel department. On the wall hangs a timetable.'
 	'The Lyceum entrance hall. It''s pretty clean and quiet. There is a desk and office for the personnel department. On the wall hangs a timetable.'
 
 
 	if workPTU = 2:
 	if workPTU = 2:
-		cls
+		*clr & cla
 		pcs_mood -= 50
 		pcs_mood -= 50
 		workPTU = 1
 		workPTU = 1
 		teachlevel = 0
 		teachlevel = 0
@@ -821,13 +821,13 @@ if $ARGS[0] = 'pos21':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		gs 'stat'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_fight.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_fight.jpg"></center>'
 		'You see a group of girls, mocking and kicking a young man.'
 		'You see a group of girls, mocking and kicking a young man.'
 
 
 		act 'Interfere for the man':
 		act 'Interfere for the man':
-			cls
+			*clr & cla
 			teachlevel += 1
 			teachlevel += 1
 			'"What are you doing? Immediately stop, I''ll call the police!" You yell at the girls. And they snort:"He''s an ssshole, he deserved it!" but they still leave the guy alone.'
 			'"What are you doing? Immediately stop, I''ll call the police!" You yell at the girls. And they snort:"He''s an ssshole, he deserved it!" but they still leave the guy alone.'
 			'You are a good example by helping the helpless man. This will positively impact your reputation.'
 			'You are a good example by helping the helpless man. This will positively impact your reputation.'
@@ -851,7 +851,7 @@ if $ARGS[0] = 'pos22':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 5
 		pcs_horny += 5
 		gs 'stat'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_rand.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_rand.jpg"></center>'
@@ -876,7 +876,7 @@ if $ARGS[0] = 'pos23':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 10
 		pcs_horny += 10
 		gs 'stat'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_korr1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_korr1.jpg"></center>'
@@ -922,7 +922,7 @@ if $ARGS[0] = 'pos24tk':
 	'In one corner there is a small old sofa.'
 	'In one corner there is a small old sofa.'
 
 
 	$prositdirizv = {
 	$prositdirizv = {
-		cls
+		*clr & cla
 		cla
 		cla
 		gs'stat'
 		gs'stat'
 		set izvad = 1
 		set izvad = 1
@@ -950,7 +950,7 @@ if $ARGS[0] = 'pos24tk':
 	if hour >= 14 and hour <= 15:
 	if hour >= 14 and hour <= 15:
 		temp = RAND(1,100)
 		temp = RAND(1,100)
 		if temp >= 90:
 		if temp >= 90:
-			cls
+			*clr & cla
 			minut += 6
 			minut += 6
 			pcs_mood -= 10
 			pcs_mood -= 10
 			pcs_willpwr -= 10
 			pcs_willpwr -= 10
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'pos25':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_klass.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_klass.jpg"></center>'
 	'Your class.'
 	'Your class.'
 	if workPTU = 3:
 	if workPTU = 3:
-		cls
+		*clr & cla
 		hour = 14
 		hour = 14
 		workPTU = 4
 		workPTU = 4
 		gs 'stat'
 		gs 'stat'
@@ -1015,7 +1015,7 @@ if $ARGS[0] = 'pos25':
 
 
 		act 'Next':gt 'etoexhib', 'pos25'
 		act 'Next':gt 'etoexhib', 'pos25'
 	elseif workPTU = 4 and gor_dorm = 4:
 	elseif workPTU = 4 and gor_dorm = 4:
-		cls
+		*clr & cla
 		hour = 14
 		hour = 14
 		gor_dorm = 5
 		gor_dorm = 5
 		gs 'stat'
 		gs 'stat'
@@ -1087,7 +1087,7 @@ if $ARGS[0] = 'pos27':
 
 
 		if temp >= 95:
 		if temp >= 95:
 			act 'Drop your pencil on the ground':
 			act 'Drop your pencil on the ground':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				pcs_horny += 40
 				minut += 60
 				minut += 60
 				teachlevel -= 5
 				teachlevel -= 5
@@ -1111,7 +1111,7 @@ if $ARGS[0] = 'pos27':
 			end
 			end
 		elseif temp >= 85 and temp < 90:
 		elseif temp >= 85 and temp < 90:
 			act 'Sit on the table':
 			act 'Sit on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				pcs_horny += 40
 				minut += 60
 				minut += 60
 				teachlevel -= 2
 				teachlevel -= 2
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'pos27':
 			end
 			end
 		elseif temp >= 75 and temp < 80:
 		elseif temp >= 75 and temp < 80:
 			act 'Drop the chalk':
 			act 'Drop the chalk':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				pcs_horny += 40
 				minut += 60
 				minut += 60
 				teachlevel -= 5
 				teachlevel -= 5
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'pos27':
 			end
 			end
 		elseif temp >= 65 and temp < 70:
 		elseif temp >= 65 and temp < 70:
 			act 'Sit sexily on the table':
 			act 'Sit sexily on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				pcs_horny += 40
 				minut += 60
 				minut += 60
 				teachlevel -= 2
 				teachlevel -= 2
@@ -1161,7 +1161,7 @@ if $ARGS[0] = 'pos27':
 			end
 			end
 		elseif temp >= 55 and temp < 60:
 		elseif temp >= 55 and temp < 60:
 			act 'Show stockings':
 			act 'Show stockings':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				pcs_horny += 40
 				minut += 60
 				minut += 60
 				teachlevel -= 2
 				teachlevel -= 2
@@ -1177,7 +1177,7 @@ if $ARGS[0] = 'pos27':
 
 
 	if hour < 16:
 	if hour < 16:
 		act 'Teach':
 		act 'Teach':
-			cls
+			*clr & cla
 			minut += 60
 			minut += 60
 			pcs_mood -= 5
 			pcs_mood -= 5
 
 
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'pos34':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		minut += 15
 		pcs_horny += 20
 		pcs_horny += 20
 		gs 'stat'
 		gs 'stat'
@@ -1289,7 +1289,7 @@ if $ARGS[0] = 'pos36':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		minut += 15
 		pcs_horny += 10
 		pcs_horny += 10
 		gs 'stat'
 		gs 'stat'
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'pos37':
 
 
 	if temp >= 90:
 	if temp >= 90:
 		act 'Say hello to the Director':
 		act 'Say hello to the Director':
-			cls
+			*clr & cla
 			minut += 15
 			minut += 15
 			teachlevel += 1
 			teachlevel += 1
 			gs 'stat'
 			gs 'stat'
@@ -1347,7 +1347,7 @@ if $ARGS[0] = 'pos38':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		minut += 15
 		pcs_horny += 10
 		pcs_horny += 10
 		gs 'stat'
 		gs 'stat'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'pos38':
 
 
 	if gor_dorm = 5:
 	if gor_dorm = 5:
 		act 'Search the Web for "Tetrodotoxin"':
 		act 'Search the Web for "Tetrodotoxin"':
-			cls
+			*clr & cla
 			minut += 120
 			minut += 120
 			gor_dorm = 6
 			gor_dorm = 6
 			gs 'stat'
 			gs 'stat'
@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'pos39':
 	temp = rand(1, 100)
 	temp = rand(1, 100)
 
 
 	if temp >= 90:
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		minut += 15
 		pcs_horny += 10
 		pcs_horny += 10
 		gs 'stat'
 		gs 'stat'
@@ -1547,25 +1547,28 @@ if $ARGS[0] = 'pos50':
 end
 end
 
 
 if $ARGS[0] = 'pos51':
 if $ARGS[0] = 'pos51':
-	cla
-	*clr
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos51'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	minut += 1
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/podezd.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/podezd.jpg"></center>'
 	'Entrance to the 5-floors building in which you live. The lock on the door leading to the attic is broken.'
 	'Entrance to the 5-floors building in which you live. The lock on the door leading to the attic is broken.'
 
 
 	if sosedQW = 0:
 	if sosedQW = 0:
+		menu_off = 1
 		'<br>Suddenly in the stairwell you are faced with a young guy who is climbing up the stairs. He runs into you and is noticeably embarrassed.<font color="#1589FF">"I''m sorry, I did not see you there. You''ve moved into apartment 69, right?"</font>'
 		'<br>Suddenly in the stairwell you are faced with a young guy who is climbing up the stairs. He runs into you and is noticeably embarrassed.<font color="#1589FF">"I''m sorry, I did not see you there. You''ve moved into apartment 69, right?"</font>'
 
 
 		act 'Yes, I live in the apartment 69':
 		act 'Yes, I live in the apartment 69':
-			cls
+			*clr & cla
 			sosedQW = 1
 			sosedQW = 1
 			minut += 5
 			minut += 5
 			gs 'stat'
 			gs 'stat'
 			'You nod, confirming that you live in apartment 69. The guy looks visibly delighted and says, <font color="#1589FF">"Wonderful. I lived there before Petrovich. He tormented the whole building. By the way I''m Timothy, and you are?"</font> '
 			'You nod, confirming that you live in apartment 69. The guy looks visibly delighted and says, <font color="#1589FF">"Wonderful. I lived there before Petrovich. He tormented the whole building. By the way I''m Timothy, and you are?"</font> '
 
 
 			act '<<$pcs_nickname>>':
 			act '<<$pcs_nickname>>':
-				cls
+				*clr & cla
 				gs 'stat'
 				gs 'stat'
 				'<font color="magenta">"My name is <<$pcs_nickname>>,"</font> you say. He nodded his head and began to get the key to open the door of the apartment 68. "Very nice. I live in the next apartment." The guy opened the door and on the threshold appeared the curious face of an elderly woman. She pointed her sharp nose at you and began to curiously look you. Timothy entered the apartment and said irritably, "Mother, stop hanging around the front door!" and closed the door.'
 				'<font color="magenta">"My name is <<$pcs_nickname>>,"</font> you say. He nodded his head and began to get the key to open the door of the apartment 68. "Very nice. I live in the next apartment." The guy opened the door and on the threshold appeared the curious face of an elderly woman. She pointed her sharp nose at you and began to curiously look you. Timothy entered the apartment and said irritably, "Mother, stop hanging around the front door!" and closed the door.'
 
 
@@ -1581,8 +1584,7 @@ if $ARGS[0] = 'pos51':
 	end
 	end
 
 
 	act 'Leave the building':
 	act 'Leave the building':
-		cls
-
+		*clr & cla
 		if $clothingworntype = 'nude':
 		if $clothingworntype = 'nude':
 			'<b><font color="red">You need to get dressed.</font></b>'
 			'<b><font color="red">You need to get dressed.</font></b>'
 			xgt $curloc
 			xgt $curloc
@@ -1600,7 +1602,10 @@ if $ARGS[0] = 'pos51':
 end
 end
 
 
 if $ARGS[0] = 'pos52':
 if $ARGS[0] = 'pos52':
-	cls
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos52'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	minut += 1
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/cherdak.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/cherdak.jpg"></center>'
@@ -1621,8 +1626,11 @@ end
 if $ARGS[0] = 'pos53':
 if $ARGS[0] = 'pos53':
 	$metka = $ARGS[0]
 	$metka = $ARGS[0]
 	$loc = $CURLOC
 	$loc = $CURLOC
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos53'
+	menu_off = 0
 	$location_type = 'secluded'
 	$location_type = 'secluded'
-	cls
+	*clr & cla
 	minut += 1
 	minut += 1
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof.jpg"></center>'
@@ -1758,7 +1766,7 @@ if $ARGS[0] = 'pos90':
 	end
 	end
 
 
 	act 'Leave':
 	act 'Leave':
-		cls
+		*clr & cla
 		gt 'etoexhib', 'pos24'
 		gt 'etoexhib', 'pos24'
 	end
 	end
 end
 end

+ 75 - 77
locations/gdksex.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'outside':
 						if DPtipe = 2:
 						if DPtipe = 2:
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/grab.jpg"></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/grab.jpg"></center>'
 							'The guy is too drunk to notice your objections and slides a hand underneath your clothes, squeezing your boobs in his hands.'
 							'The guy is too drunk to notice your objections and slides a hand underneath your clothes, squeezing your boobs in his hands.'
-							gs 'gdksex', 'blowjob', 'unpaid'
+							act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 
 
 							act 'Don''t say anything':
 							act 'Don''t say anything':
 								*clr & cla
 								*clr & cla
@@ -139,7 +139,7 @@ if $ARGS[0] = 'outside':
 							end
 							end
 
 
 							'Your horniness has made you rather frisky as well! You moan softly when <<$boydesc>> exposes your boobs and begins to lick and suck on your nipples.'
 							'Your horniness has made you rather frisky as well! You moan softly when <<$boydesc>> exposes your boobs and begins to lick and suck on your nipples.'
-							gs 'gdksex', 'blowjob', 'unpaid'
+							act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 						end
 						end
 
 
 						gs 'gdksex', 'handjob'
 						gs 'gdksex', 'handjob'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'outside':
 									if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 									if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 
 
 									gs 'gdksex', 'handjob'
 									gs 'gdksex', 'handjob'
-									gs 'gdksex', 'blowjob', 'unpaid'
+									act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 								end
 								end
 							end
 							end
 						end
 						end
@@ -420,21 +420,21 @@ if $ARGS[0] = 'outside':
 		end
 		end
 			gs 'gdksex', 'decline'
 			gs 'gdksex', 'decline'
 			gs 'gdksex', 'handjob'
 			gs 'gdksex', 'handjob'
-			gs 'gdksex', 'blowjob', 'unpaid'
+			act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 	elseif (gdk_nice_guy = 1 and pav_slut >= 100 and pav_slut < 125) or (gdk_nice_guy = 0 and pav_slut >= 65 and pav_slut < 75):
 	elseif (gdk_nice_guy = 1 and pav_slut >= 100 and pav_slut < 125) or (gdk_nice_guy = 0 and pav_slut >= 65 and pav_slut < 75):
 		'<<$boydesc>> says: "<<$pcs_nickname>>, my buddies told me you''re a <<$gnikname>>. I want to have some fun with you too!"'
 		'<<$boydesc>> says: "<<$pcs_nickname>>, my buddies told me you''re a <<$gnikname>>. I want to have some fun with you too!"'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		
 		gs 'gdksex', 'decline'	
 		gs 'gdksex', 'decline'	
 		gs 'gdksex', 'handjob'
 		gs 'gdksex', 'handjob'
-		gs 'gdksex', 'blowjob', 'unpaid'	
+		act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'	
 	elseif (gdk_nice_guy = 1 and pav_slut >= 125) or (gdk_nice_guy = 0 and pav_slut >= 75):
 	elseif (gdk_nice_guy = 1 and pav_slut >= 125) or (gdk_nice_guy = 0 and pav_slut >= 75):
 		gs 'boymass', 'B'
 		gs 'boymass', 'B'
 		'<<$boydesc>> says: "<<$pcs_nickname>>, let''s cut the crap: the whole town knows you''re a <<$gnikname>>. I want a blowjob, here''s 100 <b>₽</b>."'
 		'<<$boydesc>> says: "<<$pcs_nickname>>, let''s cut the crap: the whole town knows you''re a <<$gnikname>>. I want a blowjob, here''s 100 <b>₽</b>."'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		'He pulls his cock out of his pants while he says it, and looks at you expectantly.'
 		
 		
 		gs 'gdksex', 'decline'
 		gs 'gdksex', 'decline'
-		gs 'gdksex', 'blowjob', 'paid'
+		act 'Squat down before him': gt 'gdksex', 'blowjob', 'paid'
 	end
 	end
 
 
 	if (gdk_nice_guy = 1 and pav_slut >= 65) or (gdk_nice_guy = 0 and pav_slut >= 35):
 	if (gdk_nice_guy = 1 and pav_slut >= 65) or (gdk_nice_guy = 0 and pav_slut >= 35):
@@ -479,7 +479,7 @@ if $ARGS[0] = 'outside':
 				if slutty > 10: 'You have done worse. You only say: "200 <b>₽</b>."'
 				if slutty > 10: 'You have done worse. You only say: "200 <b>₽</b>."'
 				'<<$boydesc>> looks a bit confused for a moment, but gives you 200 <b>₽</b>.'
 				'<<$boydesc>> looks a bit confused for a moment, but gives you 200 <b>₽</b>.'
 			
 			
-				gs 'gdksex', 'blowjob', 'unpaid'
+				act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -501,94 +501,92 @@ if $ARGS[0] = 'decline':
 end
 end
 
 
 if $ARGS[0] = 'blowjob':
 if $ARGS[0] = 'blowjob':
-	act 'Squat down before him':
+	*clr & cla
+	minut += 5
+	pcs_horny += 10
+	stat['bj'] += 1
+	if $ARGS[1] = 'paid': 
+		slutty += 1
+		money += 100
+		if gdk_nice_guy = 1:
+			pav_prostitute += rand (1,3)
+		elseif gdk_nice_guy = 0:
+			pav_prostitute += rand (3,9)
+		end
+	end
+	if boynumBlock = 0:guy += 1
+	if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
+
+	sub += 1
+	gs 'boymass', 'B'
+	bmBJ[Tboynum] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj.jpg"></center>'
+	'You squat before him as you wrap your fingers around his shaft, and slowly begin to jerk him off.'
+
+	act 'Suck his dick':
 		*clr & cla
 		*clr & cla
 		minut += 5
 		minut += 5
 		pcs_horny += 10
 		pcs_horny += 10
-		stat['bj'] += 1
-		if $ARGS[1] = 'paid': 
-			slutty += 1
-			money += 100
-			if gdk_nice_guy = 1:
-				pav_prostitute += rand (1,3)
-			elseif gdk_nice_guy = 0:
-				pav_prostitute += rand (3,9)
-			end
+
+		if gdk_nice_guy = 1:
+			pav_sex += rand(1,3)
+		elseif gdk_nice_guy = 0:
+			pav_sex += rand(3,9)
 		end
 		end
-		if boynumBlock = 0:guy += 1
-		if boynumBlock > 0 and bmTOTSEX[Tboynum] = 0:guy += 1
+			
+		bmGossip[Tboynum] = 2
 
 
-		sub += 1
-		gs 'boymass', 'B'
-		bmBJ[Tboynum] += 1
 		gs 'stat'
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj.jpg"></center>'
-		'You squat before him as you wrap your fingers around his shaft, and slowly begin to jerk him off.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj2.jpg"></center>'
+		gs 'dinsex','dinrandbj'
 
 
-		act 'Suck his dick':
+		act 'Continue':
 			*clr & cla
 			*clr & cla
 			minut += 5
 			minut += 5
 			pcs_horny += 10
 			pcs_horny += 10
-
-			if gdk_nice_guy = 1:
-				pav_sex += rand(1,3)
-			elseif gdk_nice_guy = 0:
-				pav_sex += rand(3,9)
-			end
-			
-			bmGossip[Tboynum] = 2
-
+			swallow += 1
+			spafinloc = 11
+			gs 'cum_manage'
+			spafinloc = 12
+			gs 'cum_manage'
+			spafinloc = 7
+			gs 'cum_manage'
 			gs 'stat'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj2.jpg"></center>'
-			gs 'dinsex','dinrandbj'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj3.jpg"></center>'
+			gs 'dinsex','dinrandswallow'
 
 
-			act 'Continue':
-				*clr & cla
-				minut += 5
-				pcs_horny += 10
-				swallow += 1
-				spafinloc = 11
-				gs 'cum_manage'
-				spafinloc = 12
-				gs 'cum_manage'
-				spafinloc = 7
-				gs 'cum_manage'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj3.jpg"></center>'
-				gs 'dinsex','dinrandswallow'
-
-				act 'Leave':gt 'gdk'
-			end
+			act 'Leave':gt 'gdk'
 		end
 		end
+	end
 
 
-		act 'Turn around and let him fuck you':
-			*clr & cla
-			minut += 5
-			pcs_horny += 10
+	act 'Turn around and let him fuck you':
+		*clr & cla
+		minut += 5
+		pcs_horny += 10
 
 
-			if boynumBlock = 0:guy += 1
+		if boynumBlock = 0:guy += 1
 
 
-			bmSEX[Tboynum] += 1
-			gs 'boyStat', $bmNane[Tboynum]
-			pose = 1
+		bmSEX[Tboynum] += 1
+		gs 'boyStat', $bmNane[Tboynum]
+		pose = 1
 
 
-			if gdk_nice_guy = 1:
-				pav_sex += rand(1,3)
-			elseif gdk_nice_guy = 0:
-				pav_sex += rand(3,9)
-			end
+		if gdk_nice_guy = 1:
+			pav_sex += rand(1,3)
+		elseif gdk_nice_guy = 0:
+			pav_sex += rand(3,9)
+		end
 			
 			
-			bmGossip[Tboynum] = 1
+		bmGossip[Tboynum] = 1
 
 
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/sex/public/boysex.jpg"></center>'
-			'You turn around, bend over, pull down your panties, and lean your hands against a wall for support. <<$boydesc>> immediately gets behind you.'
-			dynamic $sexstart
-			gs 'dinsex','vaginal_sex',10
-			gs 'dinsex','sexcum'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/shared/sex/public/boysex.jpg"></center>'
+		'You turn around, bend over, pull down your panties, and lean your hands against a wall for support. <<$boydesc>> immediately gets behind you.'
+		dynamic $sexstart
+		gs 'dinsex','vaginal_sex',10
+		gs 'dinsex','sexcum'
 
 
-			act 'Leave':gt 'gdk'
-		end
+		act 'Leave':gt 'gdk'
 	end
 	end
 end
 end
 
 
@@ -616,7 +614,7 @@ if $ARGS[0] = 'handjob':
 				'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 				'You begin to move your hand up and down his shaft slowly, but slowly pick up the pace while you kiss him dominantly.'
 				'You begin to move your hand up and down his shaft slowly, but slowly pick up the pace while you kiss him dominantly.'
 				'<<$boydesc>> wants more however, and suddenly places his hands on your shoulder. He firmly pushes downwards, forcing you to squat before him.'
 				'<<$boydesc>> wants more however, and suddenly places his hands on your shoulder. He firmly pushes downwards, forcing you to squat before him.'
-				gs 'gdksex', 'blowjob', 'unpaid'
+				act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -809,7 +807,7 @@ if $ARGS[0] = 'kissing':
 					if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 					if pcs_horny < 75 or pav_slut < 75: act 'Go back to the disco': gt 'gdkin'
 
 
 					gs 'gdksex', 'handjob'
 					gs 'gdksex', 'handjob'
-					gs 'gdksex', 'blowjob', 'unpaid'
+					act 'Squat down before him': gt 'gdksex', 'blowjob', 'unpaid'
 				end
 				end
 			end
 			end
 		end
 		end

+ 55 - 51
locations/gevent.qsrc

@@ -7,61 +7,65 @@ if $ARGS[0] = '1':
 	*clr & cla
 	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	dyadyamishaevent = 1
 	dyadyamishaevent = 1
-	dick = 18
 	gs 'themes', 'indoors'
 	gs 'themes', 'indoors'
+	gs 'boyStat', 'A54'
 
 
-	'You agree to help, and leave the cafe with uncle Misha. When you reach his apartment, he takes you by the hand and pulls you to his bedroom, locking the door with a key behind him. Roughly grabbing you by your hair, he pulls you down to your knees and unbuttons his pants with his other hand. His erect cock springs to life, which he impatiently pushes against your pursed lips.'
-	'"Open your mouth, whore. You know why you are here", he commands, slapping your cheeks with his hand.'
-	'As you try to resist and keep your mouth shut, he starts rubbing the head of his engorged dick against your lips, spreading his precum over it with a lewd grin on his face. When he realizes you have no intentions of opening your mouth he slaps you harder and harder. After one particularly hard slap he leans over and snarls menacingly: "Stop testing my patience and open up, bitch. I''m not going to ask again."'
-	'Reluctantly you open your mouth, allowing his vile smelling dick access past your lips. He places the head of his dick firmly inside your mouth and continues to pressure you: "Go on bitch, suck it. You''ll regret it if you make me do all the work."'
-	'Thoroughly intimidated by his demands, you begin to suck him off obediently. He can tell your heart is not really into it and decides to help out, shoving his cock further and further down your throat until you''re nuzzling his hairy crotch. He leaves it in a few seconds more than you are comfortable with, making you gag. Watching you struggle puts an evil grin on his face and after a while he pulls his dick out of your mouth, a thick strand of saliva slowly dripping off it.'
-	'"Not bad <<$pcs_nickname>>, not bad. Lie down, I''m going to have some fun with you."'
-
-	act 'Lie down on the bed':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/rape.jpg"></center>'
+	'You agree to help, and leave the cafe with uncle Misha. When you reach his apartment, he takes you by the hand and pulls you to his bedroom, locking the door with a key behind him. Roughly grabbing you by your hair, he pulls you down to your knees and unbuttons his pants with his other hand.'
+	act 'Continue':
 		*clr & cla
 		*clr & cla
-		'You are no longer resisting, having lost all hope of getting yourself out of this situation. Lying wearily on the bed, he quickly takes your clothes off and sits down at your feet, examining your pussy with his fingers as much as his eyes.'
-
-		if pcs_vag = 0 and stat['vaginal'] = 0:
-			cumprecheck = 1
-			gs 'cum_manage'
-			'"You''re still a virgin? We''ll have to fix that."'
-			'He mounts you and guides the head of his cock towards your virgin pussy, rubbing it against you for a little while before slamming his cock in all the way, breaking your hymen. It hurts so much! With no concerns for your feelings, he starts hammering his dick in you, while you meekly try to resist but fail to even inconvenience him. After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to do instead. You quietly lick your blood off his dick trying to hide the disgust, and when he cums he pulls back just a bit. You can feel it spasm just as a warm liquid hits your tongue.'
-		else
-			cumprecheck = 1
-			gs 'cum_manage'
-			'"No longer a virgin, eh? No need for me to take it slow, then!"'
-			'He mounts you and guides the head of his cock towards your pussy, rubbing it against your opening for a little while before slamming his cock in all the way. He begins to fuck you with short, intense strokes.'
-
-			if dick - pcs_vag > 10 and dick - pcs_vag <= 7:'The rough handling uncle Misha gives you is feeling quite good, and you wish he''d fuck you even harder.'
-			if dick - pcs_vag > 6 and dick - pcs_vag <= 3:'Uncle Misha''s thrusts hurt a lot, and you wish for it to be over soon.'
-
-			'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to try instead. When he cums he pulls back just a bit, and you can feel it spasm as a warm liquid hits your tongue.'
-		end
-		
-		act 'Swallow his cum':
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/bj.jpg"></center>'
+		'His erect cock springs to life, which he impatiently pushes against your pursed lips.'
+		'"Open your mouth, whore. You know why you are here", he commands, slapping your cheeks with his hand.'
+		'As you try to resist and keep your mouth shut, he starts rubbing the head of his engorged dick against your lips, spreading his precum over it with a lewd grin on his face. When he realizes you have no intentions of opening your mouth he slaps you harder and harder. After one particularly hard slap he leans over and snarls menacingly: "Stop testing my patience and open up, bitch. I''m not going to ask again."'
+		'Reluctantly you open your mouth, allowing his vile smelling dick access past your lips. He places the head of his dick firmly inside your mouth and continues to pressure you: "Go on bitch, suck it. You''ll regret it if you make me do all the work."'
+		'Thoroughly intimidated by his demands, you begin to suck him off obediently. He can tell your heart is not really into it and decides to help out, shoving his cock further and further down your throat until you''re nuzzling his hairy crotch. He leaves it in a few seconds more than you are comfortable with, making you gag. Watching you struggle puts an evil grin on his face and after a while he pulls his dick out of your mouth, a thick strand of saliva slowly dripping off it.'
+		'"Not bad <<$pcs_nickname>>, not bad. Lie down, I''m going to have some fun with you."'
+		gs 'arousal', 'bj', 25, 'rough', 'rape'
+
+		act 'Lie down on the bed':
 			*clr & cla
 			*clr & cla
-			stat['vaginal'] += 1
-			stat['bj'] += 1
-			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
-			pcs_throat += 1
-
-			if pcs_vag < dick:pcs_vag += 1
-
-			rape += 1
-			minut += 75
-			money += 500
-			gs 'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/1.jpg"></center>'
-			'His sperm tastes quite bitter as it hits your tongue. Nevertheless, knowing it is what he expects you to do, you swallow it and lick your lips clean like an obedient girl.'
-			'"You swallowed it, girl?" he asks, melodramatically patting your head as a sign of approval. He continues: "Very nice. Go ahead and get dressed, I''ll give you a present for your efforts."'
-			'Uncle Misha leaves the room as you get dressed, and while you quickly put your clothes back on you hope that ''present'' is not more punishment in some shape or form. To your surprise, his present is actually a bank note worth 500 <b>₽</b>.'
-			'"Go on child, go buy yourself some ice cream. I know you''re from a poor family, so if you''re ever in need of money you can come pay me a visit. There''s more where that came from."'
-			'Having had his fun, he gestures that you should get lost now. You quietly take the money from uncle Misha''s hand, and leave as he says.'
-
-			act 'Leave uncle Misha''s apartment':gt 'pod_ezd','etaj_2'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/sex.jpg"></center>'
+			'You are no longer resisting, having lost all hope of getting yourself out of this situation. Lying wearily on the bed, he quickly takes your clothes off and sits down at your feet, examining your pussy with his fingers as much as his eyes.'
+
+			if pcs_vag = 0 and stat['vaginal'] = 0:
+				cumprecheck = 1
+				gs 'cum_manage'
+				'"You''re still a virgin? We''ll have to fix that."'
+				'He mounts you and guides the head of his cock towards your virgin pussy, rubbing it against you for a little while before slamming his cock in all the way, breaking your hymen. It hurts so much! With no concerns for your feelings, he starts hammering his dick in you, while you meekly try to resist but fail to even inconvenience him.'
+				gs 'arousal', 'vaginal', 25, 'rough'
+				'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to do instead. You quietly lick your blood off his dick trying to hide the disgust, and when he cums he pulls back just a bit. You can feel it spasm just as a warm liquid hits your tongue.'
+			else
+				cumprecheck = 1
+				gs 'cum_manage'
+				'"No longer a virgin, eh? No need for me to take it slow, then!"'
+				'He mounts you and guides the head of his cock towards your pussy, rubbing it against your opening for a little while before slamming his cock in all the way. He begins to fuck you with short, intense strokes.'
+
+				if dick - pcs_vag > 10 and dick - pcs_vag <= 7:'The rough handling uncle Misha gives you is feeling quite good, and you wish he''d fuck you even harder.'
+				if dick - pcs_vag > 6 and dick - pcs_vag <= 3:'Uncle Misha''s thrusts hurt a lot, and you wish for it to be over soon.'
+				gs 'arousal', 'vaginal', 25, 'rough', 'rape'
+
+				'After raping your pussy for a few minutes, he pulls his dick out and forcibly thrusts it down your throat. You no longer have the strength to even fight it and just go along with whatever he wants to do, trying to appease him so he doesn''t think of anything worse to try instead. When he cums he pulls back just a bit, and you can feel it spasm as a warm liquid hits your tongue.'
+			end
+			
+			act 'Swallow his cum':
+				*clr & cla
+				swallow += 1
+				gs 'cum_call', 'mouth', 'A54'
+				minut += 5
+				money += 500
+				gs 'arousal', 'end'
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/misha/sex/cum.jpg"></center>'
+				'His sperm tastes quite bitter as it hits your tongue. Nevertheless, knowing it is what he expects you to do, you swallow it and lick your lips clean like an obedient girl.'
+				'"You swallowed it, girl?" he asks, melodramatically patting your head as a sign of approval. He continues: "Very nice. Go ahead and get dressed, I''ll give you a present for your efforts."'
+				'Uncle Misha leaves the room as you get dressed, and while you quickly put your clothes back on you hope that ''present'' is not more punishment in some shape or form. To your surprise, his present is actually a bank note worth 500 <b>₽</b>.'
+				'"Go on child, go buy yourself some ice cream. I know you''re from a poor family, so if you''re ever in need of money you can come pay me a visit. There''s more where that came from."'
+				'Having had his fun, he gestures that you should get lost now. You quietly take the money from uncle Misha''s hand, and leave as he says.'
+
+				act 'Leave uncle Misha''s apartment':gt 'pod_ezd','etaj_2'
+			end
 		end
 		end
 	end
 	end
 end
 end

+ 19 - 9
locations/gopskver.qsrc

@@ -12,6 +12,8 @@ gs 'stat'
 gs 'dinsexFX'
 gs 'dinsexFX'
 if $prevloc = 'gkafe':
 if $prevloc = 'gkafe':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
+elseif $prevloc = 'pavtrainhall':
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 else
 else
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 end
 end
@@ -21,6 +23,8 @@ if kotovLoveQW > 0:
 	if hour < 20:
 	if hour < 20:
 		if $prevloc = 'gkafe':
 		if $prevloc = 'gkafe':
 			'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
 			'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
+		elseif $prevloc = 'pavtrainhall':
+			'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
 		else
 		else
 			'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
 			'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
 		end
 		end
@@ -207,8 +211,8 @@ else
 				iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
 				iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
 
 
 				act 'Decline the beer and leave':
 				act 'Decline the beer and leave':
-					if $prevloc = 'gkafe':
-						gt 'gkafe'
+					if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+						gt $prevloc
 					else
 					else
 						gt 'gskver', 'start'
 						gt 'gskver', 'start'
 					end
 					end
@@ -231,8 +235,8 @@ else
 					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 					'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 							
 							
 					act 'Continue':
 					act 'Continue':
-						if $prevloc = 'gkafe':
-							gt 'gkafe'
+						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+							gt $prevloc
 						else
 						else
 							gt 'gskver', 'start'
 							gt 'gskver', 'start'
 						end
 						end
@@ -260,17 +264,21 @@ else
 						'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 						'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
 
 						act 'Continue':
 						act 'Continue':
-							if $prevloc = 'gkafe':
-								gt 'gkafe'
+							if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+								gt $prevloc
 							else
 							else
 								gt 'gskver', 'start'
 								gt 'gskver', 'start'
 							end
 							end
 						end
 						end
 					end
 					end
 				elseif pav_slut < 75:
 				elseif pav_slut < 75:
-					if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+					if $prevloc = 'gkafe':
+						'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'			
+					elseif $prevloc = 'pavtrainhall':
+						'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'	
+					end
 					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
 					'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
-
+					
 					act '"Yes that''s true"':
 					act '"Yes that''s true"':
 						*clr & cla
 						*clr & cla
 						gs 'stat'
 						gs 'stat'
@@ -381,7 +389,9 @@ else
 			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 			
 			
 			if $prevloc = 'gkafe':
 			if $prevloc = 'gkafe':
-				act 'Blush and quickly leave the cafe':gt'pavtrain'
+				act 'Blush and quickly leave the cafe': gt $prevloc
+			elseif $prevloc = 'pavtrainhall':
+				act 'Blush and quickly leave the train station': gt $prevloc
 			else
 			else
 				act 'Blush and keep walking':gt 'gskver', 'start'
 				act 'Blush and keep walking':gt 'gskver', 'start'
 				if BjBeerQW >= 5:
 				if BjBeerQW >= 5:

+ 4 - 2
locations/husbSex.qsrc

@@ -472,8 +472,10 @@ if $ARGS[0] = 'miss':
 
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/vag.jpg"></center>'
 	'<<$husName>> spreads your legs and uses his fingers to caress your pussy.'
 	'<<$husName>> spreads your legs and uses his fingers to caress your pussy.'
+	'After a few minutes you are practically begging him to take you and he is more than willing, it is slow and gentle making you feel full and satisfied.'
 
 
-	gs 'arousal', 'vaginal_finger', 20
+	gs 'arousal', 'vaginal_finger', 5
+	gs 'arousal', 'vaginal', 15
 	gs 'stat'
 	gs 'stat'
 	
 	
 	gs'orgazm','start'
 	gs'orgazm','start'
@@ -497,7 +499,7 @@ if $ARGS[0] = 'dog':
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
 	'<<$husName>> turns you around into the doggy style position and spreads your buttcheeks before he enters you.'
 	'<<$husName>> turns you around into the doggy style position and spreads your buttcheeks before he enters you.'
 
 
-	gs 'arousal', 'anal', 30, 'sub'
+	gs 'arousal', 'vaginal', 30, 'sub'
 	gs 'stat'
 	gs 'stat'
 	
 	
 	gs'orgazm','start'
 	gs'orgazm','start'

+ 1 - 1
locations/obj_din.qsrc

@@ -2656,7 +2656,7 @@ end
 
 
 if $ARGS[0] = 'wait':
 if $ARGS[0] = 'wait':
 	cla
 	cla
-	waiting = input ("How long would you like to wait?<br>(Default 15 minutes, maximum 120 minutes)")
+	waiting = input ("How long would you like to wait?<br>(maximum 120 minutes, leave blank or press cancel to wait 15 minutes)")
 
 
 	if waiting = '':
 	if waiting = '':
 		minut += 15
 		minut += 15

+ 1 - 1
locations/pavtrainhall.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = '':
 	*nl
 	*nl
 	if StoryLine = 1 and SchoolAtestat = 0:
 	if StoryLine = 1 and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:
-			'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
+			'You see your classmates <a href="exec:minut += 3 & $prevloc = $loc & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
 		end
 		end
 	end
 	end
 	*nl
 	*nl

+ 1 - 1
locations/street.qsrc

@@ -68,7 +68,7 @@ housrA = 0
 if car > 0 and cardrive = 1: 'In the parking lot is <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 if car > 0 and cardrive = 1: 'In the parking lot is <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 
 
 if home_owned[1] > 0:
 if home_owned[1] > 0:
-	act '<b>GO HOME</b>':
+	act '<b>Go home</b>':
 		gorand = rand(0, 100)
 		gorand = rand(0, 100)
 
 
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80:
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80: