[fixes] menu variables in dk

[changed] move the leave option to the top in dk, autotraidF, zaprF and zaprfWash

locations/autotraidF.qsrc

@@ -6,8 +6,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
-	cla
-	*clr
+	*clr & cla
 	gs 'stat'
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
@@ -16,14 +15,14 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
+	act 'Leave': minut += 5 & gt 'Nord'
+	
 	if hour <= 17:
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
 
 		act 'Look at the new cars for sale': gt 'autosalonF', 'start'
 		act 'Look at the used cars for sale':gt 'autotraidF', 'car'
 	end
-
-	act 'Leave': minut += 5 & gt 'Nord'
 end
 
 if $ARGS[0] = 'manager1':
@@ -32,8 +31,7 @@ if $ARGS[0] = 'manager1':
 	$menu_arg = 'manager1'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
-	cla
-	*clr
+	*clr & cla
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
@@ -82,17 +80,18 @@ if $ARGS[0] = 'car':
 	$menu_arg = 'car'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
-	cla
-	*clr
+	*clr & cla
 	minut += 5
 	carT = 0
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
 	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. And according to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on, though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
-	''
+	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
+	act 'Return': gt 'autotraidF', 'start'
+	
 	if hour <= 17:
 		act 'Inspect a 2107':
 			cla
@@ -355,8 +354,6 @@ if $ARGS[0] = 'car':
 			end
 		end
 	end
-
-	act 'Return': gt 'autotraidF', 'start'
 end
 
 --- autotraidF ---------------------------------

locations/dk.qsrc

@@ -1,13 +1,18 @@
 # dk
 $location_type = 'public_indoors'
 if $ARGS[0] = 'start':
-	menu_off = 1
+	$loc = 'dk'
+	$metka = 'start'
+	$menu_loc = 'dk'
+	$menu_arg = 'start'
+	menu_off = 0
 	'<center><b>The Vladimir Lenin community centre</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk4.jpg"></center>'
 	'Open: 9 through 17 on workdays, closed on Saturday and Sunday.'
 	gs 'stat'
+	act 'Leave': minut += 5 & gt 'nord'
 	if hour >= 9 and hour <= 17 and week < 6:
-		act 'Enter':gt 'dk', 'holl'
+		act 'Enter': minut += 1 & gt 'dk', 'holl'
 
 		if avtoskul >= 1 and avtoskul < 11 and skulday ! daystart and age >= 18:
 			act 'Driving lesson (2:00)':
@@ -24,12 +29,14 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Leave': minut += 5 & gt 'nord'
 end
 
 if $ARGS[0] = 'holl':
-	menu_off = 1
-	minut += 1
+	$loc = 'dk'
+	$metka = 'holl'
+	$menu_loc = 'dk'
+	$menu_arg = 'holl'
+	menu_off = 0
 	gs 'stat'
 	'<center><b>The Vladimir Lenin community centre</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk1.jpg"></center>'
@@ -45,7 +52,6 @@ if $ARGS[0] = 'holl':
 	!!'Medium for new opportunities - only here only freebie.'
 	'</TR></table></center>'
 
-	
 	!!act 'Go to a medium':
 	!!	cla
 	!!	*clr
@@ -57,11 +63,12 @@ if $ARGS[0] = 'holl':
 	!!	act 'Leave':gt 'dk', 'holl'
 	!!end
 
+	act 'Go outside': minut += 1 & gt 'dk', 'start'
 	if hour >= 9 and hour <= 17 and week < 6:
-
 		if money >= 1000:
 			act 'Personal development class - 1,000 <b>₽</b> (1:00)':
 				cla
+				menu_off = 1
 				money -= 1000
 				pcs_dom += 5
 				minut += 60
@@ -75,6 +82,7 @@ if $ARGS[0] = 'holl':
 		if vokalday ! daystart and alexeySex > 0 and alexeyVopros = 2:
 			act 'Singing lesson (1:00)':
 				cla
+				menu_off = 1
 				alexeyQW += 1
 				minut += 60
 				vokal_exp += 1
@@ -132,6 +140,7 @@ if $ARGS[0] = 'holl':
 		elseif money >= 500 and vokalday ! daystart and alexeySex > 0 and alexeyVopros = 1:
 			act 'Singing lesson - 500 <b>₽</b> (1:00)':
 				*clr & cla
+				menu_off = 1
 				money -= 500
 				minut += 60
 				alexeyQW += 1
@@ -145,6 +154,7 @@ if $ARGS[0] = 'holl':
 		elseif money >= 500 and vokalday ! daystart and alexeySex > 0 and alexeyVopros = 0:
 			act 'Singing lesson - 500 <b>₽</b> (1:00)':
 				*clr & cla
+				menu_off = 1
 				alexeyQW += 1
 				vokal_exp += 1
 				vokalday = daystart
@@ -177,6 +187,7 @@ if $ARGS[0] = 'holl':
 		elseif money >= 500 and vokalday ! daystart and alexeySex = 0:
 			act 'Singing lesson - 500 <b>₽</b> (1:00)':
 				*clr & cla
+				menu_off = 1
 				minut += 60
 				money -= 500
 				alexeyQW += 1
@@ -285,6 +296,7 @@ if $ARGS[0] = 'holl':
 		if avtoskul = 0 and money >= 30000 and prava = 0 and age >= 18:
 			act 'Book a driving training course (30,000 <b>₽</b>)':
 				cla
+				menu_off = 1
 				money -= 30000
 				avtoskul = 1
 				!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk2.jpg"></center>'
@@ -299,6 +311,7 @@ if $ARGS[0] = 'holl':
 		if secrDiplom = 0 and sekrObu = 0 and money >= 15000:
 			act 'Book a secretarial course (15,000 <b>₽</b>)':
 				cla
+				menu_off = 1
 				money -= 15000
 				sekrObu = 1
 				!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk2.jpg"></center>'
@@ -310,8 +323,8 @@ if $ARGS[0] = 'holl':
 
 		if sekrObu > 0 and sekrObu < 11 and secrday ! daystart:
 			act 'Secretarial class (2:00)':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				secrday = daystart
 				sekrObu += 1
 				minut += 120
@@ -324,8 +337,8 @@ if $ARGS[0] = 'holl':
 			end
 		elseif sekrObu >= 11 and secrday ! daystart:
 			act 'Secretarial diploma':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				secrday = daystart
 				sekrObu = 0
 				minut += 15
@@ -343,8 +356,8 @@ if $ARGS[0] = 'holl':
 
 		if avtoskul = 11 and skulday ! daystart and age >= 18:
 			act 'Driving theory (2:00)':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				skulday = daystart
 				avtoskul = 12
 				minut += 120
@@ -357,8 +370,8 @@ if $ARGS[0] = 'holl':
 			end
 		elseif avtoskul = 12 and skulday ! daystart and age >= 18:
 			act 'Driving test (2:00)':
-				cla
-				*clr
+				*clr & cla
+				menu_off = 1
 				minut += 120
 				avtoskul = 0
 				prava = 1
@@ -375,6 +388,7 @@ if $ARGS[0] = 'holl':
 		if money >= 5000 and masash < 10 and masashshoolday ! daystart:
 			act 'Learn how to give massages (5,000 <b>₽</b>)':
 				cla
+				menu_off = 1
 				masashshoolday = daystart
 				money -= 5000
 				masash += 1
@@ -388,8 +402,6 @@ if $ARGS[0] = 'holl':
 			end
 		end
 	end
-
-	act 'Leave': minut += 6 & gt 'nord'
 end
 
 --- dk ---------------------------------

locations/zaprF.qsrc

@@ -22,6 +22,22 @@ if $ARGS[0] = 'start':
 	'The petrol price is 30 <b>₽</b> per liter.'
 	*nl
 	
+	act 'Leave':
+		if cardrive = 6:
+			minut += 5
+			gt 'nord'
+		elseif cardrive = 21:
+			minut += 5
+			gt 'pavCommercial'
+		elseif litltown = 0:
+			minut += 5
+			gt 'nord'
+		elseif litltown = 1:
+			minut += 5
+			gt 'pavCommercial'
+		end
+	end
+	
 	if temper < 10:
 		'It''s too cold outside to wash cars. You''re more likely to get ill than make money. Maybe try again when the weather is warmer?'
 	elseif sunWeather = 0:
@@ -35,10 +51,18 @@ if $ARGS[0] = 'start':
 	end
 	act 'Go to the toilet':gt 'zaprF', 'toilet'
 
-	if car > 0:
-		if cardrive = 6 or cardrive = 21:'Your <a href="exec:GS ''carF'', ''start''"><<$car>></a> is parked here.'
-	end
+	if car > 0 and cardrive = 6 or cardrive = 21:
+		'Your <a href="exec: gs ''carF'', ''start''"><<$car>></a> is parked here.'
+		act 'Buy a canister able to contain up to 5 liters of gasoline for 150 <b>₽</b>':
+			cla
+			kanistra += 1
+			money -= 150
+			'You bought a canister of gasoline. (It was automatically put in the trunk)'
 
+			act 'Disengage from the pump':gt 'zaprF', 'start'
+		end
+	end
+	
 	zprbenz = 40 - benz
 
 	if benz < 40 and car > 0 and cardrive = 6 or benz < 40 and car > 0 and cardrive = 21:
@@ -65,33 +89,6 @@ if $ARGS[0] = 'start':
 			'You do not have enough money to refuel.'
 		end
 	end
-
-	if car > 0:
-		act 'Buy a canister able to contain up to 5 liters of gasoline for 150 <b>₽</b>':
-			cla
-			kanistra += 1
-			money -= 150
-			'You bought a canister of gasoline. (It was automatically put in the trunk)'
-
-			act 'Disengage from the pump':gt 'zaprF', 'start'
-		end
-	end
-
-	act 'Leave':
-		if cardrive = 6:
-			minut += 5
-			gt 'nord'
-		elseif cardrive = 21:
-			minut += 5
-			gt 'pavCommercial'
-		elseif litltown = 0:
-			minut += 5
-			gt 'nord'
-		elseif litltown = 1:
-			minut += 5
-			gt 'pavCommercial'
-		end
-	end
 end
 
 if $ARGS[0] = 'toilet':

locations/zaprFWash.qsrc

@@ -17,8 +17,8 @@ if $ARGS[0] = 'start':
 		
 		'The gas station worker chases you away: "At least go wash yourself off first, whore!"'
 		
-		act 'Go to the toilet':gt 'zaprF', 'toilet'
 		act 'Leave':gt 'zaprF', 'start'
+		act 'Go to the toilet':gt 'zaprF', 'toilet'
 	else
 		gt 'zaprFWash', 'wash'
 	end