Browse Source

[fixes] menu variables in train and nordtrain

julzor 5 years ago
parent
commit
05153de076
2 changed files with 44 additions and 46 deletions
  1. 7 2
      locations/nordtrain.qsrc
  2. 37 44
      locations/train.qsrc

+ 7 - 2
locations/nordtrain.qsrc

@@ -109,7 +109,9 @@ if $ARGS[0] = 'toilet':
 end
 
 if $ARGS[0] = 'ticket':
-	menu_off = 1
+	$menu_loc = 'nordtrain'
+	$menu_arg = 'ticket'
+	menu_off = 0
 	*clr & cla
 	gs 'stat'
 	'<center><h4>Ticket office</h4></center>'
@@ -143,7 +145,10 @@ if $ARGS[0] = 'ticket':
 	end
 end
 
-if $ARGS[0] = 'buy_ticket':
+if $ARGS[0] = 'buy_ticket':	
+	$menu_loc = 'nordtrain'
+	$menu_arg = 'buy_ticket'
+	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'nordtrain', 'inside'
 	

+ 37 - 44
locations/train.qsrc

@@ -21,6 +21,9 @@ if $ARGS[0] = 'communal':
 end
 
 if $ARGS[0] = 'communal_tickets':
+	$menu_loc = 'train'
+	$menu_arg = 'communal_tickets'
+	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'train', 'communal'
 	
@@ -76,6 +79,10 @@ if $ARGS[0] = 'communal_tickets':
 end
 
 if $ARGS[0] = 'communal_trains':
+	$menu_loc = 'train'
+	$menu_arg = 'communal_trains'
+	menu_off = 0
+
 	act 'Leave the platform': gt 'train', 'communal'
 	
 	act 'Take a train to St. Petersburg city center': gt 'train', 'communal_centre'
@@ -111,9 +118,7 @@ if $ARGS[0] = 'communal_ind':
 	$loc = 'nordtrain'
 	$metka = 'platform'
 	minut += 10
-	$menu_loc = 'nordtrain'
-	$menu_arg = 'communal_ind'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
@@ -128,9 +133,7 @@ if $ARGS[0] = 'communal_village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 10
-	$menu_loc = 'train'
-	$menu_arg = 'communal_village'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
@@ -145,9 +148,7 @@ if $ARGS[0] = 'communal_oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 20
-	$menu_loc = 'train'
-	$menu_arg = 'communal_oldtown'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
@@ -163,9 +164,7 @@ if $ARGS[0] = 'communal_pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
 	minut += 25
-	$menu_loc = 'pavtrainhall'
-	$menu_arg = 'communal_pavlovsk'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
@@ -177,7 +176,7 @@ end
 !!destination 4
 if $ARGS[0] = 'village':
 	*clr & cla
-	$menu_loc = ''
+	$menu_loc = 'train'
 	$menu_arg = 'village'
 	menu_off = 0
 	gs 'stat'
@@ -199,6 +198,9 @@ if $ARGS[0] = 'village':
 end
 
 if $ARGS[0] = 'village_tickets':
+	$menu_loc = 'train'
+	$menu_arg = 'village_tickets'
+	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'train', 'village'
 	
@@ -254,6 +256,10 @@ if $ARGS[0] = 'village_tickets':
 end
 
 if $ARGS[0] = 'village_trains':
+	$menu_loc = 'train'
+	$menu_arg = 'village_trains'
+	menu_off = 0
+
 	act 'Leave the platform': gt 'train', 'village'
 
 	act 'Take a train to St. Petersburg city center': gt 'train', 'village_centre'
@@ -270,9 +276,7 @@ end
 if $ARGS[0] = 'village_centre':
 	$loc = 'cityTrain'
 	$metka = 'inside'
-	$menu_loc = 'cityTrain'
-	$menu_arg = 'village_centre'
-	menu_off = 0
+	menu_off = 1
 	minut += 25
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -290,9 +294,7 @@ end
 if $ARGS[0] = 'village_ind':
 	$loc = 'nordtrain'
 	$metka = 'platform'
-	$menu_loc = 'nordtrain'
-	$menu_arg = 'village_ind'
-	menu_off = 0
+	menu_off = 1
 	minut += 20
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -311,9 +313,7 @@ if $ARGS[0] = 'village_communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 10
-	$menu_loc = 'train'
-	$menu_arg = 'village_communal'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -329,9 +329,7 @@ if $ARGS[0] = 'village_oldtown':
 	$loc = 'train'
 	$metka = 'oldtown'
 	minut += 10
-	$menu_loc = 'train'
-	$menu_arg = 'village_oldtown'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -350,9 +348,7 @@ if $ARGS[0] = 'village_pavlovsk':
 	money -= 75
 	train_dest = 6
 	minut += 15
-	$menu_loc = 'pavtrainhall'
-	$menu_arg = 'village_pavlovsk'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
@@ -367,7 +363,7 @@ end
 !!destination 5
 if $ARGS[0] = 'oldtown':
 	*clr & cla
-	$menu_loc = ''
+	$menu_loc = 'train'
 	$menu_arg = 'oldtown'
 	menu_off = 0
 	gs 'stat'
@@ -385,6 +381,9 @@ if $ARGS[0] = 'oldtown':
 end
 
 if $ARGS[0] = 'oldtown_tickets':
+	$menu_loc = 'train'
+	$menu_arg = 'oldtown_tickets'
+	menu_off = 0
 	
 	act 'Leave the ticket office': gt 'train', 'oldtown'
 	
@@ -440,6 +439,10 @@ if $ARGS[0] = 'oldtown_tickets':
 end
 
 if $ARGS[0] = 'oldtown_trains':
+	$menu_loc = 'train'
+	$menu_arg = 'oldtown_trains'
+	menu_off = 0
+	
 	act 'Leave the platform': gt 'train', 'oldtown'
 
 	act 'Take a train to St. Petersburg city center': gt 'train', 'oldtown_centre'
@@ -457,9 +460,7 @@ if $ARGS[0] = 'oldtown_centre':
 	$loc = 'cityTrain'
 	$metka = 'inside'
 	minut += 35
-	$menu_loc = 'cityTrain'
-	$menu_arg = 'oldtown_centre'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -477,9 +478,7 @@ if $ARGS[0] = 'oldtown_ind':
 	$loc = 'nordtrain'
 	$metka = 'platform'
 	minut += 30
-	$menu_loc = 'nordtrain'
-	$menu_arg = 'oldtown_ind'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
@@ -495,9 +494,7 @@ if $ARGS[0] = 'oldtown_communal':
 	$loc = 'train'
 	$metka = 'communal'
 	minut += 20
-	$menu_loc = 'train'
-	$menu_arg = 'oldtown_communal'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
 	gs 'stat'
@@ -513,9 +510,7 @@ if $ARGS[0] = 'oldtown_village':
 	$loc = 'train'
 	$metka = 'village'
 	minut += 10
-	$menu_loc = 'train'
-	$menu_arg = 'oldtown_village'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
@@ -530,9 +525,7 @@ if $ARGS[0] = 'oldtown_pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
 	minut += 5
-	$menu_loc = 'pavtrainhall'
-	$menu_arg = 'oldtown_pavlovsk'
-	menu_off = 0
+	menu_off = 1
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'