[fixed] wrong goto's in gopskver and dead ends in etoexhib

locations/etoexhib.qsrc

@@ -304,7 +304,7 @@ if $ARGS[0] = 'pos9':
 		'Work:"For some shoveling work, 3000<b>₽</b>."'
 
 		act 'Agree':
-			cls
+			*clr & cla
 			etoexhib = 11
 			gs 'stat'
 			'<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."'
 
 		act 'Decline':
-			cls
+			*clr & cla
 			etoexhib = 15
 			temp = daystart
 			gs 'stat'
@@ -384,7 +384,7 @@ if $ARGS[0] = 'pos12':
 		end
 
 		act 'Accept and give half the amount':
-			cls
+			*clr & cla
 			money -= 1500
 			etoexhib = 14
 			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.'
 
 	if workPTU = 2:
-		cls
+		*clr & cla
 		pcs_mood -= 50
 		workPTU = 1
 		teachlevel = 0
@@ -821,13 +821,13 @@ if $ARGS[0] = 'pos21':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		gs 'stat'
 		'<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.'
 
 		act 'Interfere for the man':
-			cls
+			*clr & cla
 			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.'
 			'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)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 5
 		gs 'stat'
 		'<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)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		pcs_horny += 10
 		gs 'stat'
 		'<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.'
 
 	$prositdirizv = {
-		cls
+		*clr & cla
 		cla
 		gs'stat'
 		set izvad = 1
@@ -950,7 +950,7 @@ if $ARGS[0] = 'pos24tk':
 	if hour >= 14 and hour <= 15:
 		temp = RAND(1,100)
 		if temp >= 90:
-			cls
+			*clr & cla
 			minut += 6
 			pcs_mood -= 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>'
 	'Your class.'
 	if workPTU = 3:
-		cls
+		*clr & cla
 		hour = 14
 		workPTU = 4
 		gs 'stat'
@@ -1015,7 +1015,7 @@ if $ARGS[0] = 'pos25':
 
 		act 'Next':gt 'etoexhib', 'pos25'
 	elseif workPTU = 4 and gor_dorm = 4:
-		cls
+		*clr & cla
 		hour = 14
 		gor_dorm = 5
 		gs 'stat'
@@ -1087,7 +1087,7 @@ if $ARGS[0] = 'pos27':
 
 		if temp >= 95:
 			act 'Drop your pencil on the ground':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 5
@@ -1111,7 +1111,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 85 and temp < 90:
 			act 'Sit on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 75 and temp < 80:
 			act 'Drop the chalk':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 5
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 65 and temp < 70:
 			act 'Sit sexily on the table':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1161,7 +1161,7 @@ if $ARGS[0] = 'pos27':
 			end
 		elseif temp >= 55 and temp < 60:
 			act 'Show stockings':
-				cls
+				*clr & cla
 				pcs_horny += 40
 				minut += 60
 				teachlevel -= 2
@@ -1177,7 +1177,7 @@ if $ARGS[0] = 'pos27':
 
 	if hour < 16:
 		act 'Teach':
-			cls
+			*clr & cla
 			minut += 60
 			pcs_mood -= 5
 
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'pos34':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 20
 		gs 'stat'
@@ -1289,7 +1289,7 @@ if $ARGS[0] = 'pos36':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1315,7 +1315,7 @@ if $ARGS[0] = 'pos37':
 
 	if temp >= 90:
 		act 'Say hello to the Director':
-			cls
+			*clr & cla
 			minut += 15
 			teachlevel += 1
 			gs 'stat'
@@ -1347,7 +1347,7 @@ if $ARGS[0] = 'pos38':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'pos38':
 
 	if gor_dorm = 5:
 		act 'Search the Web for "Tetrodotoxin"':
-			cls
+			*clr & cla
 			minut += 120
 			gor_dorm = 6
 			gs 'stat'
@@ -1405,7 +1405,7 @@ if $ARGS[0] = 'pos39':
 	temp = rand(1, 100)
 
 	if temp >= 90:
-		cls
+		*clr & cla
 		minut += 15
 		pcs_horny += 10
 		gs 'stat'
@@ -1547,25 +1547,28 @@ if $ARGS[0] = 'pos50':
 end
 
 if $ARGS[0] = 'pos51':
-	cla
-	*clr
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos51'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<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.'
 
 	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>'
 
 		act 'Yes, I live in the apartment 69':
-			cls
+			*clr & cla
 			sosedQW = 1
 			minut += 5
 			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> '
 
 			act '<<$pcs_nickname>>':
-				cls
+				*clr & cla
 				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.'
 
@@ -1581,8 +1584,7 @@ if $ARGS[0] = 'pos51':
 	end
 
 	act 'Leave the building':
-		cls
-
+		*clr & cla
 		if $clothingworntype = 'nude':
 			'<b><font color="red">You need to get dressed.</font></b>'
 			xgt $curloc
@@ -1600,7 +1602,10 @@ if $ARGS[0] = 'pos51':
 end
 
 if $ARGS[0] = 'pos52':
-	cls
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos52'
+	menu_off = 0
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/cherdak.jpg"></center>'
@@ -1621,8 +1626,11 @@ end
 if $ARGS[0] = 'pos53':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
+	$menu_loc = 'etoexhib'
+	$menu_arg = 'pos53'
+	menu_off = 0
 	$location_type = 'secluded'
-	cls
+	*clr & cla
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/roof.jpg"></center>'
@@ -1758,7 +1766,7 @@ if $ARGS[0] = 'pos90':
 	end
 
 	act 'Leave':
-		cls
+		*clr & cla
 		gt 'etoexhib', 'pos24'
 	end
 end

locations/gopskver.qsrc

@@ -12,6 +12,8 @@ gs 'stat'
 gs 'dinsexFX'
 if $prevloc = 'gkafe':
 	'<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
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 end
@@ -21,6 +23,8 @@ if kotovLoveQW > 0:
 	if hour < 20:
 		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.'
+		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
 			'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
@@ -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.'
 
 				act 'Decline the beer and leave':
-					if $prevloc = 'gkafe':
-						gt 'gkafe'
+					if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+						gt $prevloc
 					else
 						gt 'gskver', 'start'
 					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.'
 							
 					act 'Continue':
-						if $prevloc = 'gkafe':
-							gt 'gkafe'
+						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+							gt $prevloc
 						else
 							gt 'gskver', 'start'
 						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.'
 
 						act 'Continue':
-							if $prevloc = 'gkafe':
-								gt 'gkafe'
+							if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+								gt $prevloc
 							else
 								gt 'gskver', 'start'
 							end
 						end
 					end
 				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?"'
-
+					
 					act '"Yes that''s true"':
 						*clr & cla
 						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.'
 			
 			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
 				act 'Blush and keep walking':gt 'gskver', 'start'
 				if BjBeerQW >= 5:

locations/pavtrainhall.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = '':
 	*nl
 	if StoryLine = 1 and SchoolAtestat = 0:
 		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
 	*nl

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 home_owned[1] > 0:
-	act '<b>GO HOME</b>':
+	act '<b>Go home</b>':
 		gorand = rand(0, 100)
 
 		if (loh > 0 or gnewQW = 7) and gopdolg > 0 and hour >= 20 and gorand >= 80: