Browse Source

[added]menu variables added T-U

Blatte 5 years ago
parent
commit
eff0ba4ba3

+ 3 - 0
locations/Terminal.qsrc

@@ -3,6 +3,9 @@
 CLOSE ALL
 CLOSE ALL
 minut += 5
 minut += 5
 $location_type = 'public_outdoors'
 $location_type = 'public_outdoors'
+$menu_loc = 'Terminal'
+$menu_arg = ''
+menu_off = 0
 gs 'stat'
 gs 'stat'
 '<center><b><font color="maroon">Storage terminal</font></b></center>'
 '<center><b><font color="maroon">Storage terminal</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/industrial/terminal/terminal0.jpg"></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/industrial/terminal/terminal0.jpg"></center>'

+ 3 - 0
locations/TerminalOffice.qsrc

@@ -1,6 +1,9 @@
 # TerminalOffice
 # TerminalOffice
 $location_type = 'public_indoors'
 $location_type = 'public_indoors'
 minut += 1
 minut += 1
+$menu_loc = 'TerminalOffice'
+$menu_arg = ''
+menu_off = 0
 gs 'stat'
 gs 'stat'
 
 
 ! In the office if he knows we can buy a product or to perform a task boss of bystrousky.
 ! In the office if he knows we can buy a product or to perform a task boss of bystrousky.

+ 3 - 0
locations/talent_agency.qsrc

@@ -3,6 +3,9 @@
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
 	cls
 	cls
 	minut += 5
 	minut += 5
+	$menu_loc = 'talent_agency'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Aurora Talent Agency</font></b></center>'
 	'<center><b><font color="maroon">Aurora Talent Agency</font></b></center>'

+ 4 - 2
locations/taxi.qsrc

@@ -2,8 +2,10 @@
 
 
 if $ARGS[0] = '':
 if $ARGS[0] = '':
 	act 'Hail taxi':
 	act 'Hail taxi':
-		cla
-		*clr
+		cla & *clr
+		$menu_loc = 'taxi'
+		$menu_arg = ''
+		menu_off = 0
 		minut += 5
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/taxi.base0,'+rand(1,4)+'.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/taxi/taxi.base0,'+rand(1,4)+'.jpg"></center>'
 		'Seeing a taxi coming down the road you raise your arm and wave him down, as he stops you get in.'
 		'Seeing a taxi coming down the road you raise your arm and wave him down, as he stops you get in.'

+ 1 - 0
locations/therapist.qsrc

@@ -7,6 +7,7 @@ $location_type = 'public_indoors'
 
 
 if $ARGS[0] = '':
 if $ARGS[0] = '':
 	therapistday = daystart
 	therapistday = daystart
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/room.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/room.jpg"></center>'
 	'You step into the office of <a href="exec:dynamic $pavlov">Dr. Pavlov</a>, who invites you in with a warm smile.'
 	'You step into the office of <a href="exec:dynamic $pavlov">Dr. Pavlov</a>, who invites you in with a warm smile.'
 	'The room looks like a study room, appearing warm and inviting. There is desk with a chair at one end of the room, but it appears to be seldom used. On the desk there is an older <a href="exec: VIEW ''images/locations/pavlovsk/clinic/therapist/pavlovfamily.jpg''">photograph of Dr. Pavlov''s family</a>, in which he appears to be about two decades younger.'
 	'The room looks like a study room, appearing warm and inviting. There is desk with a chair at one end of the room, but it appears to be seldom used. On the desk there is an older <a href="exec: VIEW ''images/locations/pavlovsk/clinic/therapist/pavlovfamily.jpg''">photograph of Dr. Pavlov''s family</a>, in which he appears to be about two decades younger.'

+ 3 - 0
locations/torgcentr.qsrc

@@ -7,6 +7,9 @@ gs 'stat'
 ! WD: Supermarket fix
 ! WD: Supermarket fix
 $loc = 'torgcentr'
 $loc = 'torgcentr'
 $location_type = 'public_indoors'
 $location_type = 'public_indoors'
+$menu_loc = 'torgcentr'
+$menu_arg = ''
+menu_off = 0
 
 
 if hour >= 8 and hour <= 20:
 if hour >= 8 and hour <= 20:
 	*p '<center><a href="exec: minut += 3 & gt ''young_shop'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'
 	*p '<center><a href="exec: minut += 3 & gt ''young_shop'', ''start''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a>'

+ 3 - 1
locations/torgpred.qsrc

@@ -1,5 +1,7 @@
 # torgpred
 # torgpred
-
+$menu_loc = 'torgpred'
+$menu_arg = ''
+menu_off = 0
 gs 'stat'
 gs 'stat'
 '<center><b><font color="maroon">Trade Representative</font></b></center>'
 '<center><b><font color="maroon">Trade Representative</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener.jpg"></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener.jpg"></center>'

+ 76 - 0
locations/train.qsrc

@@ -3,6 +3,9 @@
 !!destination 3
 !!destination 3
 if $ARGS[0] = 'communal':
 if $ARGS[0] = 'communal':
 	*clr & cla
 	*clr & cla
+	$menu_loc = 'train'
+	$menu_arg = 'communal'
+	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
 	'An old railway platform, it looks like it was abandoned the sign no longer legible, but there''s a hand painted sign from the communal cottages not too far away.'
 	'An old railway platform, it looks like it was abandoned the sign no longer legible, but there''s a hand painted sign from the communal cottages not too far away.'
@@ -24,6 +27,7 @@ if $ARGS[0] = 'communal_tickets':
 	act 'Buy a ticket to St. Petersburg city center (75 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city center (75 <b>₽</b>)':
 		if money >= 75:
 		if money >= 75:
 			money -= 75
 			money -= 75
+			menu_off = 1
 			gt 'train', 'communal_centre'
 			gt 'train', 'communal_centre'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -33,6 +37,7 @@ if $ARGS[0] = 'communal_tickets':
 	act 'Buy a ticket to St. Petersburg city industrial area (50 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city industrial area (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'communal_ind'
 			gt 'train', 'communal_ind'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -42,6 +47,7 @@ if $ARGS[0] = 'communal_tickets':
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'communal_village'
 			gt 'train', 'communal_village'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -51,6 +57,7 @@ if $ARGS[0] = 'communal_tickets':
 	act 'Buy a ticket to the old platform by the old town (75 <b>₽</b>)':
 	act 'Buy a ticket to the old platform by the old town (75 <b>₽</b>)':
 		if money >= 75:
 		if money >= 75:
 			money -= 75
 			money -= 75
+			menu_off = 1
 			gt 'train', 'communal_oldtown'
 			gt 'train', 'communal_oldtown'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -60,6 +67,7 @@ if $ARGS[0] = 'communal_tickets':
 	act 'Buy a ticket to Pavlovsk (100 <b>₽</b>)':
 	act 'Buy a ticket to Pavlovsk (100 <b>₽</b>)':
 		if money >= 100:
 		if money >= 100:
 			money -= 100
 			money -= 100
+			menu_off = 1
 			gt 'train', 'communal_pavlovsk'
 			gt 'train', 'communal_pavlovsk'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -85,6 +93,9 @@ if $ARGS[0] = 'communal_centre':
 	minut += 15
 	minut += 15
 	$loc = 'cityTrain'
 	$loc = 'cityTrain'
 	$metka = 'inside'
 	$metka = 'inside'
+	$menu_loc = 'cityTrain'
+	$menu_arg = 'communal_centre'
+	menu_off = 0
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -100,6 +111,9 @@ if $ARGS[0] = 'communal_ind':
 	$loc = 'nordtrain'
 	$loc = 'nordtrain'
 	$metka = 'platform'
 	$metka = 'platform'
 	minut += 10
 	minut += 10
+	$menu_loc = 'nordtrain'
+	$menu_arg = 'communal_ind'
+	menu_off = 0
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
@@ -114,6 +128,9 @@ if $ARGS[0] = 'communal_village':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'village'
 	$metka = 'village'
 	minut += 10
 	minut += 10
+	$menu_loc = 'train'
+	$menu_arg = 'communal_village'
+	menu_off = 0
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
@@ -128,6 +145,9 @@ if $ARGS[0] = 'communal_oldtown':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'oldtown'
 	$metka = 'oldtown'
 	minut += 20
 	minut += 20
+	$menu_loc = 'train'
+	$menu_arg = 'communal_oldtown'
+	menu_off = 0
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -143,6 +163,9 @@ if $ARGS[0] = 'communal_pavlovsk':
 	$loc = 'pavtrainhall'
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
 	$metka = 'platform'
 	minut += 25
 	minut += 25
+	$menu_loc = 'pavtrainhall'
+	$menu_arg = 'communal_pavlovsk'
+	menu_off = 0
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -154,6 +177,9 @@ end
 !!destination 4
 !!destination 4
 if $ARGS[0] = 'village':
 if $ARGS[0] = 'village':
 	*clr & cla
 	*clr & cla
+	$menu_loc = ''
+	$menu_arg = 'village'
+	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	if storyline = 1:
 	if storyline = 1:
@@ -179,6 +205,7 @@ if $ARGS[0] = 'village_tickets':
 	act 'Buy a ticket to St. Petersburg city center (100 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city center (100 <b>₽</b>)':
 		if money >= 100:
 		if money >= 100:
 			money -= 100
 			money -= 100
+			menu_off = 1
 			gt 'train', 'village_centre'
 			gt 'train', 'village_centre'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -188,6 +215,7 @@ if $ARGS[0] = 'village_tickets':
 	act 'Buy a ticket to St. Petersburg city industrial area (75 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city industrial area (75 <b>₽</b>)':
 		if money >= 75:
 		if money >= 75:
 			money -= 75
 			money -= 75
+			menu_off = 1
 			gt 'train', 'village_ind'
 			gt 'train', 'village_ind'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -197,6 +225,7 @@ if $ARGS[0] = 'village_tickets':
 	act 'Buy a ticket to the old platform by the communal village (50 <b>₽</b>)':
 	act 'Buy a ticket to the old platform by the communal village (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'village_communal'
 			gt 'train', 'village_communal'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -206,6 +235,7 @@ if $ARGS[0] = 'village_tickets':
 	act 'Buy a ticket to the old town (50 <b>₽</b>)':
 	act 'Buy a ticket to the old town (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'village_oldtown'
 			gt 'train', 'village_oldtown'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -215,6 +245,7 @@ if $ARGS[0] = 'village_tickets':
 	act 'Buy a ticket to Pavlovsk (75 <b>₽</b>)':
 	act 'Buy a ticket to Pavlovsk (75 <b>₽</b>)':
 		if money >= 75:
 		if money >= 75:
 			money -= 75
 			money -= 75
+			menu_off = 1
 			gt 'train', 'village_pavlovsk'
 			gt 'train', 'village_pavlovsk'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -239,6 +270,9 @@ end
 if $ARGS[0] = 'village_centre':
 if $ARGS[0] = 'village_centre':
 	$loc = 'cityTrain'
 	$loc = 'cityTrain'
 	$metka = 'inside'
 	$metka = 'inside'
+	$menu_loc = 'cityTrain'
+	$menu_arg = 'village_centre'
+	menu_off = 0
 	minut += 25
 	minut += 25
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -256,6 +290,9 @@ end
 if $ARGS[0] = 'village_ind':
 if $ARGS[0] = 'village_ind':
 	$loc = 'nordtrain'
 	$loc = 'nordtrain'
 	$metka = 'platform'
 	$metka = 'platform'
+	$menu_loc = 'nordtrain'
+	$menu_arg = 'village_ind'
+	menu_off = 0
 	minut += 20
 	minut += 20
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -274,6 +311,9 @@ if $ARGS[0] = 'village_communal':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'communal'
 	$metka = 'communal'
 	minut += 10
 	minut += 10
+	$menu_loc = 'train'
+	$menu_arg = 'village_communal'
+	menu_off = 0
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -289,6 +329,9 @@ if $ARGS[0] = 'village_oldtown':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'oldtown'
 	$metka = 'oldtown'
 	minut += 10
 	minut += 10
+	$menu_loc = 'train'
+	$menu_arg = 'village_oldtown'
+	menu_off = 0
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -307,6 +350,9 @@ if $ARGS[0] = 'village_pavlovsk':
 	money -= 75
 	money -= 75
 	train_dest = 6
 	train_dest = 6
 	minut += 15
 	minut += 15
+	$menu_loc = 'pavtrainhall'
+	$menu_arg = 'village_pavlovsk'
+	menu_off = 0
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -321,6 +367,9 @@ end
 !!destination 5
 !!destination 5
 if $ARGS[0] = 'oldtown':
 if $ARGS[0] = 'oldtown':
 	*clr & cla
 	*clr & cla
+	$menu_loc = ''
+	$menu_arg = 'oldtown'
+	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
 	'A fairly modern railway platform. The old town of Pushkin is just a five minute walk away from here, on the other side of the road.'
 	'A fairly modern railway platform. The old town of Pushkin is just a five minute walk away from here, on the other side of the road.'
@@ -342,6 +391,7 @@ if $ARGS[0] = 'oldtown_tickets':
 	act 'Buy a ticket to St. Petersburg city center (125 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city center (125 <b>₽</b>)':
 		if money >= 125:
 		if money >= 125:
 			money -= 125
 			money -= 125
+			menu_off = 1
 			gt 'train', 'oldtown_centre'
 			gt 'train', 'oldtown_centre'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -351,6 +401,7 @@ if $ARGS[0] = 'oldtown_tickets':
 	act 'Buy a ticket to St. Petersburg city industrial area (100 <b>₽</b>)':
 	act 'Buy a ticket to St. Petersburg city industrial area (100 <b>₽</b>)':
 		if money >= 100:
 		if money >= 100:
 			money -= 100
 			money -= 100
+			menu_off = 1
 			gt 'train', 'oldtown_ind'
 			gt 'train', 'oldtown_ind'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -360,6 +411,7 @@ if $ARGS[0] = 'oldtown_tickets':
 	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
 	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
 		if money >= 75:
 		if money >= 75:
 			money -= 75
 			money -= 75
+			menu_off = 1
 			gt 'train', 'oldtown_communal'
 			gt 'train', 'oldtown_communal'
 		else
 		else
 			'You don''t have enough money for this ticket.'
 			'You don''t have enough money for this ticket.'
@@ -369,6 +421,7 @@ if $ARGS[0] = 'oldtown_tickets':
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'oldtown_village'
 			gt 'train', 'oldtown_village'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -378,6 +431,7 @@ if $ARGS[0] = 'oldtown_tickets':
 	act 'Buy a ticket to Pavlovsk (50 <b>₽</b>)':
 	act 'Buy a ticket to Pavlovsk (50 <b>₽</b>)':
 		if money >= 50:
 		if money >= 50:
 			money -= 50
 			money -= 50
+			menu_off = 1
 			gt 'train', 'oldtown_pavlovsk'
 			gt 'train', 'oldtown_pavlovsk'
 		else
 		else
 			'You don''t have enough money for this ticket.'	
 			'You don''t have enough money for this ticket.'	
@@ -403,6 +457,9 @@ if $ARGS[0] = 'oldtown_centre':
 	$loc = 'cityTrain'
 	$loc = 'cityTrain'
 	$metka = 'inside'
 	$metka = 'inside'
 	minut += 35
 	minut += 35
+	$menu_loc = 'cityTrain'
+	$menu_arg = 'oldtown_centre'
+	menu_off = 0
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -420,6 +477,9 @@ if $ARGS[0] = 'oldtown_ind':
 	$loc = 'nordtrain'
 	$loc = 'nordtrain'
 	$metka = 'platform'
 	$metka = 'platform'
 	minut += 30
 	minut += 30
+	$menu_loc = 'nordtrain'
+	$menu_arg = 'oldtown_ind'
+	menu_off = 0
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -435,6 +495,9 @@ if $ARGS[0] = 'oldtown_communal':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'communal'
 	$metka = 'communal'
 	minut += 20
 	minut += 20
+	$menu_loc = 'train'
+	$menu_arg = 'oldtown_communal'
+	menu_off = 0
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -450,6 +513,9 @@ if $ARGS[0] = 'oldtown_village':
 	$loc = 'train'
 	$loc = 'train'
 	$metka = 'village'
 	$metka = 'village'
 	minut += 10
 	minut += 10
+	$menu_loc = 'train'
+	$menu_arg = 'oldtown_village'
+	menu_off = 0
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
@@ -464,6 +530,9 @@ if $ARGS[0] = 'oldtown_pavlovsk':
 	$loc = 'pavtrainhall'
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
 	$metka = 'platform'
 	minut += 5
 	minut += 5
+	$menu_loc = 'pavtrainhall'
+	$menu_arg = 'oldtown_pavlovsk'
+	menu_off = 0
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	gs 'stat'
@@ -494,6 +563,7 @@ end
 !!event Weed
 !!event Weed
 if $ARGS[0] = 'weed':
 if $ARGS[0] = 'weed':
 	train_event = 1
 	train_event = 1
+	menu_off = 1
 	*clr & cla
 	*clr & cla
 	gs 'stat'
 	gs 'stat'
 	'<center><h4>Pavlovsk Station</h4></center>'
 	'<center><h4>Pavlovsk Station</h4></center>'
@@ -638,6 +708,7 @@ if $ARGS[0] = 'private':
 	*clr & cla
 	*clr & cla
 	minut -= 35
 	minut -= 35
 	train_event = 1
 	train_event = 1
+	menu_off = 1
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 	'You board the train and walk past several of the private compartments on your way to the general seating on the car you are on.'
 	'You board the train and walk past several of the private compartments on your way to the general seating on the car you are on.'
@@ -722,6 +793,7 @@ end
 
 
 if $ARGS[0] = 'oldman':
 if $ARGS[0] = 'oldman':
 	*clr & cla
 	*clr & cla
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 	'You choose an empty seat by the window and look outside, lost in thought, as others board the train. Shortly after the departure, an old man sits down next to you. He offers you some nuts from a bag he is carrying, and you politely take a few; you would have been content with spending the rest of the ride in silence but the man then starts talking to you about how he has not been back to this area since his wife died a few years ago. Curious and feeling somewhat obligated to keep the conversation going, as awkward as it may be, you ask him about his wife and learn that, until recently, they had had a happy, wonderful life together; alas, what they thought was just a bad cough that wouldn''t go away turned out to be lung cancer and she died a very slow and agonizing death while he could do nothing but watch and care for her.'
 	'You choose an empty seat by the window and look outside, lost in thought, as others board the train. Shortly after the departure, an old man sits down next to you. He offers you some nuts from a bag he is carrying, and you politely take a few; you would have been content with spending the rest of the ride in silence but the man then starts talking to you about how he has not been back to this area since his wife died a few years ago. Curious and feeling somewhat obligated to keep the conversation going, as awkward as it may be, you ask him about his wife and learn that, until recently, they had had a happy, wonderful life together; alas, what they thought was just a bad cough that wouldn''t go away turned out to be lung cancer and she died a very slow and agonizing death while he could do nothing but watch and care for her.'
 	*nl		
 	*nl		
@@ -796,6 +868,7 @@ end
 
 
 if $ARGS[0] = 'fit':
 if $ARGS[0] = 'fit':
 	*clr & cla
 	*clr & cla
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'You are sitting in an empty seat by the window and looking outside, lost in thought, as others board the train. Shortly after the departure, a man in his thirties - or perhaps early forties - sits down next to you. You don''t give him more than a short glance as he takes the seat but it doesn''t take more than that to notice that he is in <b>great</b> shape. You try not to stare but you just can''t help yourself - the world outside the window is just too boring to hold your attention. Of course, your gaze does not go unnoticed and the man, grinning, engages you in a conversation.'
 	'You are sitting in an empty seat by the window and looking outside, lost in thought, as others board the train. Shortly after the departure, a man in his thirties - or perhaps early forties - sits down next to you. You don''t give him more than a short glance as he takes the seat but it doesn''t take more than that to notice that he is in <b>great</b> shape. You try not to stare but you just can''t help yourself - the world outside the window is just too boring to hold your attention. Of course, your gaze does not go unnoticed and the man, grinning, engages you in a conversation.'
 	*nl
 	*nl
@@ -867,6 +940,7 @@ end
 
 
 if $ARGS[0] = 'young':
 if $ARGS[0] = 'young':
 	*clr & cla
 	*clr & cla
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train and it eventually departs. Most of the train ride passes in you silently daydreaming with the scenery outside blurring together. It''s not until someone heavily sits down next to you that you snap out of it. You turn to see a good looking young guy in his early to mid-twenties, greeting you with a bright smile. "I''ve gotta say: I''ve walked from one end of this train to the other and you are by far the most beautiful girl on it."' 
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train and it eventually departs. Most of the train ride passes in you silently daydreaming with the scenery outside blurring together. It''s not until someone heavily sits down next to you that you snap out of it. You turn to see a good looking young guy in his early to mid-twenties, greeting you with a bright smile. "I''ve gotta say: I''ve walked from one end of this train to the other and you are by far the most beautiful girl on it."' 
 	*nl
 	*nl
@@ -958,6 +1032,8 @@ if $ARGS[0] = 'young':
 end
 end
 
 
 if $ARGS[0] = 'Gopnik':
 if $ARGS[0] = 'Gopnik':
+	*clr & cla
+	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride3.jpg" ></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride3.jpg" ></center>'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train. A gopnik boy sits down next to you, but you try to ignore him and keep staring outside. Unfazed by that, he gives you once-over, a lewd grin you only see from the corner of your eyes, and leans in close, putting his arm around you. You turn your head to tell him off but your mouth is immediately covered by his! And, not content with just kissing you, the gopnik''s hand starts roaming across your breasts.'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train. A gopnik boy sits down next to you, but you try to ignore him and keep staring outside. Unfazed by that, he gives you once-over, a lewd grin you only see from the corner of your eyes, and leans in close, putting his arm around you. You turn your head to tell him off but your mouth is immediately covered by his! And, not content with just kissing you, the gopnik''s hand starts roaming across your breasts.'
 	act 'Stop him':
 	act 'Stop him':

+ 1 - 0
locations/train_incidental.qsrc

@@ -4,6 +4,7 @@
 
 
 if $ARGS[0] = 'events':
 if $ARGS[0] = 'events':
 	*clr & cla
 	*clr & cla
+	menu_off = 1
 	train_event = 1
 	train_event = 1
 	gt 'train_incidental', '<<rand(1, 28)>>'
 	gt 'train_incidental', '<<rand(1, 28)>>'
 end
 end

+ 6 - 4
locations/ugel.qsrc

@@ -1,9 +1,11 @@
 # ugel
 # ugel
-$metka = $ARGS[0]
-$loc = $CURLOC
+$metka = ''
+$loc = 'ugel'
+$menu_loc = 'ugel'
+$menu_arg = ''
+menu_off = 0
 $location_type = 'secluded'
 $location_type = 'secluded'
-
-clr
+cla & *clr
 gs'stat'
 gs'stat'
 set pcs_horny +=5
 set pcs_horny +=5
 
 

+ 7 - 6
locations/univer.qsrc

@@ -2,10 +2,11 @@
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
 	$sexloc = 'univer'
 	$sexloc = 'univer'
     $location_type = 'public_indoors'
     $location_type = 'public_indoors'
-	cla
-	clr
-	*clr
+	cla & *clr
 	minut += 5
 	minut += 5
+	$menu_loc = 'univer'
+	$menu_arg = 'start'
+	menu_off = 0
 	gs 'stat'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">The University</font></b></center>'
 	'<center><b><font color="maroon">The University</font></b></center>'
@@ -36,6 +37,7 @@ if $ARGS[0] = 'start':
 			minut += 5
 			minut += 5
 			money -= 15000
 			money -= 15000
 			abiturient = 1
 			abiturient = 1
+			menu_off = 1
 			'You paid 15,000 <b>₽</b> for the preparatory classes. They are held every weekday at <b>21:00</b>.'
 			'You paid 15,000 <b>₽</b> for the preparatory classes. They are held every weekday at <b>21:00</b>.'
 
 
 			act 'Move away':gt 'univer', 'start'
 			act 'Move away':gt 'univer', 'start'
@@ -106,9 +108,7 @@ end
 
 
 if $ARGS[0] = 'dekanat':
 if $ARGS[0] = 'dekanat':
 	$sexloc = 'univer'
 	$sexloc = 'univer'
-	cla
-	clr
-	*clr
+	cla & *clr
 	minut += 5
 	minut += 5
 
 
 	if examen = 1:
 	if examen = 1:
@@ -160,6 +160,7 @@ if $ARGS[0] = 'dekanat':
 			minut = 0
 			minut = 0
 			lektor += 1
 			lektor += 1
 			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
 			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+			menu_off = 1
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom1.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom1.jpg"></center>'
 			'You attend the lecture, taking notes as the professor calmly goes through the course material.'
 			'You attend the lecture, taking notes as the professor calmly goes through the course material.'