[changed] The car actions were messy and the times were really bad, so some correction to that and hope its less awkward now. :smile:

locations/carF.qsrc

@@ -8,7 +8,6 @@ $enddrive = {
 	if cardrive = 5:gt 'park', 'start'
 	if cardrive = 6:gt 'zaprF', 'start'
 	if cardrive = 7:gt 'autoservisF', 'start'
-	if cardrive = 8:gt 'autosalonF', 'start'
 	if cardrive = 9:gt 'autotraidF', 'start'
 	if cardrive = 10:gt 'park', 'whore'
 	if cardrive = 11:gt 'sauna'
@@ -82,14 +81,23 @@ if $ARGS[0] = 'salon':
 	'<<$teh>>'
 
 	if cardrive = 1:'Through the windshield, you see St. Petersburg''s residential area.'
-	if cardrive = 2:'Through the windshield, you see St. Petersburg''s downtown (city center).'
+	if cardrive = 2:'Through the windshield, you see St. Petersburg''s city center.'
 	if cardrive = 3:'Through the windshield, you see St. Petersburg''s industrial region.'
 	if cardrive = 4:'Through the windshield, you see the lake.'
 	if cardrive = 5:'Through the windshield, you can see the park.'
+	if cardrive = 6:'Through the windshield, you can see the gas station in the city industrial region.'
+	if cardrive = 7:'Through the windshield, you can see the car service centre.'
+	if cardrive = 9:'Through the windshield, you can see many of the cars for sale outside the showroom.'
+	if cardrive = 10:'Through the windshield, you can see hookers outside the park.'
+	if cardrive = 11:'Through the windshield, you can see the sauna.'
 	if cardrive = 12:'Through the windshield, you see a construction site.'
+	if cardrive = 13:'Through the windshield, you can see the suburban cooperative.'
 	if cardrive = 14:'Through the windshield, you see the Old Town (Pushkin).'
-	if cardrive = 19:'Through the windshield, you see the Train Station.'
+	if cardrive = 18:'Through the windshield, you can see your mansion.'
+	if cardrive = 19:'Through the windshield, you see the city industrial region train station.'
 	if cardrive = 20:'Through the windshield, you can see Pavlovsk''s residential area.'
+	if cardrive = 21:'Through the windshield, you can see the gas station near Pavlovsk.'
+	if cardrive = 22:'Through the windshield, you can see the highway.'
 	if cardrive = 23:'Through the windshield, you see the huts of the village of Gadukino.'
 	if cardrive = 24:'Through the windshield, you can see Pavlovsk''s commercial region.'
 	if cardrive = 25:'You cross one of the bridges that leads to the island.'
@@ -165,374 +173,336 @@ if $ARGS[0] = 'salon':
 		end
 
 		if wrek = 0:
-			if cardrive >= 20:
-				if cardrive ! 3:
-					act 'Go to St. Petersburg''s Industrial Region':
-						cla
-						minut += 75
-						benz -= 1
-						teh -= rand(3, 6)
-						cardrive = 3
-						'You drive for more than an hour on the highway before you get to the city.'
-						dynamic $enddrive
-					end
-				end
 
-				if cardrive ! 1:
-					act 'Go to St. Petersburg''s residential area':
-						cla
-						minut += 90
-						benz -= 1
-						teh -= rand(3, 6)
-						cardrive = 1
-						'You drive for more than an hour on the highway before you get to St. Petersburg''s residential area.'
-						dynamic $enddrive
-					end
+			if (cardrive = 22 and nroad >= 18) or cardrive = 20 or cardrive = 21 or cardrive = 24 or cardrive = 26:
+				car_town = 0
+				act 'Go to local destination': gs 'carF', 'pav'
+				act 'Go to the city':
+					minut += 65
+					msg 'You drive for more than an hour on the highway before you get to the city.'
+					gs 'carF', 'city'
 				end
-
-				if cardrive ! 2:
-					act 'Go to St. Petersburg city center':
-						cla
-						minut += 80
-						benz -= 1
-						teh -= rand(3, 6)
-						cardrive = 2
-						'You drive for more than an hour on the highway before you get to St. Petersburg city center.'
-						dynamic $enddrive
-					end
+				act 'Go to another destination':
+					minut += 30
+					msg 'You drive out of Pavlovsk.'
+					gs 'carF', 'other'
 				end
-      
-				if cardrive ! 21:
-					act 'Go to the gas station':
-						cla
-						minut += 15
-						benz -= 1
-						teh -= rand(1, 3)
-						cardrive = 21
-						'15 minutes later, you arrive at your destination.'
-						dynamic $enddrive
-					end
+			elseif cardrive <= 11 or cardrive = 25:
+				car_town = 1
+				act 'Go to another city destination': gs 'carF', 'city'
+				act 'Go to Pavlosvsk':
+					minut += 65
+					msg 'You drive for more than an hour on the highway before you get to the town of Pavlovsk.'
+					gs 'carF', 'pav'
 				end
-			end
-
-			if home_owned[5] > 0 and cardrive ! 18:
-				act 'Go to your mansion':
-					cla
-
-					if cardrive >= 20:
-						minut += 60
-						benz -= 1
-						teh -= rand(1, 3)
-						cardrive = 18
-					else
-						minut += 15
-						benz -= 1
-						teh -= rand(1, 3)
-						cardrive = 18
-					end
-
-					'You drive to your mansion.'
-					dynamic $enddrive
+				act 'Go to another destination':
+					minut += 30
+					msg 'You drive out of the city.'
+					gs 'carF', 'other'
 				end
-			end
-
-			if cardrive ! 1 and cardrive < 20:
-				act 'Go to St. Petersburg''s residential area':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 1
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
+			else
+				car_town = 2
+				act 'Go to a city destination':
+					minut += 30
+					msg 'You drive for half an hour on the highway before you get to the city.'
+					gs 'carF', 'city'
 				end
-			end
-
-			if cardrive ! 2 and cardrive < 20:
-				act 'Go to St. Petersburg city center':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 2
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
+				act 'Go to a Pavlosvsk destination':
+					minut += 30
+					msg 'You drive for half an hour on the highway before you get to the town of Pavlovsk.'
+					gs 'carF', 'pav'
 				end
+				act 'Go to another destination': gs 'carF', 'other'
 			end
+		end
+	end
+end
 
-			if cardrive ! 3 and cardrive < 20:
-				act 'Go to the St. Petersburg''s industrial area':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 3
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
-			end
+if $ARGS[0] = 'other':
+	cla
+	if home_owned[5] > 0 and cardrive ! 18:
+		act 'Go to your mansion':
+			cla
 
-			if cardrive ! 19 and cardrive < 20:
-				act 'Go to the city train station':
-					cla
-					minut = minut + 15
-					benz = benz - 1
-					teh = teh - RAND(1,3)
-					cardrive = 19
+			if car_town ! 1:
+				minut += 60
+				benz -= 1
+				teh -= rand(1, 3)
+				cardrive = 18
+			else
+				minut += 10
+				benz -= 1
+				teh -= rand(1, 3)
+				cardrive = 18
+			end
 
-					'15 minutes later, you arrive at your destination.'
+			'You drive to your mansion.'
+			dynamic $enddrive
+		end
+	end
 
-					dynamic $enddrive
-				end
+	if cardrive ! 12:
+		act 'Go to the construction site':
+			cla
+			if car_town ! 1:
+				minut += 55
+				'It takes nearly an hour to get to your destination.'
+			else
+				minut += 15
+				'15 minutes later, you arrive at your destination.'
 			end
+			benz -= 1
+			teh -= rand(2, 5)
+			cardrive = 12
 
-			if cardrive ! 4 and cardrive < 20:
-				act 'Go to the city lake':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 4
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
-			end
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 5 and cardrive < 20:
-				act 'Go to the city park':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 5
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
+	if cardrive ! 13:
+		act 'Go to the Suburban Cooperative':
+			cla
+			if car_town ! 1:
+				minut += 45
+				'It takes three quarters of an hour to get to your destination.'
+			else
+				minut += 25
+				'25 minutes later, you arrive at your destination.'
 			end
+			benz -= 1
+			teh -= rand(2, 5)
+			cardrive = 13
 
-			if cardrive ! 6 and cardrive < 20:
-				act 'Go to the gas station':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 6
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
-			end
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 7 and cardrive < 20:
-				act 'Go to the auto repair shop':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 7
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
+	if cardrive ! 14:
+		act 'Go to Old Town (Pushkin)':
+			cla
+			if car_town ! 0:
+				minut += 60
+				'It takes about an hour to get to Old Town (Pushkin).'
+			else
+				minut += 5
+				'5 minutes later, you reach Old Town (Pushkin).'
 			end
+			benz -= 1
+			teh -= rand(2, 5)
+			cardrive = 14
 
-			if cardrive ! 8 and cardrive < 20:
-				act 'Go to the car dealership':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 8
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
-			end
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 9 and cardrive < 20:
-				act 'Go to the used car dealership':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 9
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
+	if cardrive ! 23:
+		act 'Go to the village of Gadukino':
+			cla
+			benz = benz - 1
+			teh = teh - RAND(3,6)
+			cardrive = 23
+
+			if car_town ! 0:
+				minut += 55
+				'You spend about an hour on the highway going to Gadukino.'
+			else
+				minut += 15
+				'15 minutes later, you reach your destination.'
 			end
 
-			if cardrive ! 25 and cardrive < 20:
-				act 'Go to the island':
-					cla
-					minut += 15
-					benz -= 1
-					teh -= rand(1, 3)
-					cardrive = 25
-					'15 minutes later, you arrive at your destination.'
-					dynamic $enddrive
-				end
-			end
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 12:
-				act 'Go to the construction site':
-					cla
-					if cardrive < 20:
-						minut += 60
-						'It takes an hour to get to your destination.'
-					else
-						minut += 15
-						'15 minutes later, you arrive at your destination.'
-					end
-					benz -= 1
-					teh -= rand(2, 5)
-					cardrive = 12
+	act 'Drive around the local track (1:00)':
+		cla
+		minut += 60
+		benz -= 4
+		teh -= rand(2, 6)
+		pcs_mood += 20
+		wipo += 10
+		'You go to the track and have fun driving around before leaving.'
 
-					dynamic $enddrive
-				end
-			end
+		act 'Finish':xgt 'carF', 'salon'
+	end
+end
 
-			if cardrive ! 13:
-				act 'Go to the Suburban Cooperative':
-					cla
-					if cardrive >= 20:
-						minut += 60
-						'It takes an hour to get to your destination.'
-					else
-						minut += 15
-						'15 minutes later, you arrive at your destination.'
-					end
-					benz -= 1
-					teh -= rand(2, 5)
-					cardrive = 13
+if $ARGS[0] = 'pav':
+	cla
+	if cardrive ! 26:
+		act 'Go to Pavlovsk''s Industrial Region':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 26
+			'5 minutes later, you reach your destination.'
+
+			dynamic $enddrive
+		end
+	end
 
-					dynamic $enddrive
-				end
-			end
+	if cardrive ! 20:
+		act 'Go to Pavlovsk''s Residential Area':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 20
+			'5 minutes later, you reach your destination.'
 
-			if cardrive ! 14:
-				act 'Go to Old Town (Pushkin)':
-					cla
-					if cardrive < 20:
-						minut += 75
-						'It takes you more than an hour to get to Old Town (Pushkin).'
-					else
-						minut += 15
-						'15 minutes later, you reach Old Town (Pushkin).'
-					end
-					benz -= 1
-					teh -= rand(2, 5)
-					cardrive = 14
+			dynamic $enddrive
+		end
+	end
 
-					dynamic $enddrive
-				end
-			end
+	if cardrive ! 24:
+		act 'Go to Pavlovsk''s Commercial Region':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 24
+			'5 minutes later, you reach your destination.'
 
-			if cardrive ! 23:
-				act 'Go to the village of Gadukino':
-					cla
-					benz = benz - 1
-					teh = teh - RAND(3,6)
-					cardrive = 23
-
-					if cardrive < 20:
-						minut += 75
-						'You spend more than an hour on the highway going to Gadukino.'
-					else
-						minut += 15
-						'15 minutes later, you reach your destination.'
-					end
+			dynamic $enddrive
+		end
+	end
 
-					dynamic $enddrive
-				end
-			end
+	if cardrive ! 21:
+		act 'Go to the gas station':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 21
+			'5 minutes later, you reach your destination.'
 
-			if cardrive ! 20:
-				act 'Go to Pavlovsk''s Residential Area':
-					cla
-					benz -= 1
-					teh -= rand(3, 6)
-					cardrive = 20
-
-					if cardrive < 20:
-						minut += 75
-						'You spend more than an hour on the highway going to Pavlovsk.'
-					else
-						minut += 15
-						'15 minutes later, you reach your destination.'
-					end
+			dynamic $enddrive
+		end
+	end
+end
 
-					dynamic $enddrive
-				end
-			end
+if $ARGS[0] = 'city':
+	cla
+	if cardrive ! 3:
+		act 'Go to St. Petersburg''s Industrial Region':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 3
+			'You drive for more than an hour on the highway before you get to the city.'
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 24:
-				act 'Go to Pavlovsk''s Commercial Region':
-					cla
-					benz -= 1
-					teh -= rand(3, 6)
-					cardrive = 24
-
-					if cardrive < 20:
-						minut += 75
-						'You spend more than an hour on the highway going to Pavlovsk.'
-					else
-						minut += 15
-						'15 minutes later, you reach your destination.'
-					end
+	if cardrive ! 1:
+		act 'Go to St. Petersburg''s residential area':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 1
+			'You drive for more than an hour on the highway before you get to St. Petersburg''s residential area.'
+			dynamic $enddrive
+		end
+	end
 
-					dynamic $enddrive
-				end
-			end
+	if cardrive ! 2:
+		act 'Go to St. Petersburg city center':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 2
+			'You drive for more than an hour on the highway before you get to St. Petersburg city center.'
+			dynamic $enddrive
+		end
+	end
 
-			if cardrive ! 26:
-				act 'Go to Pavlovsk''s Industrial Region':
-					cla
-					benz -= 1
-					teh -= rand(3, 6)
-					cardrive = 26
-
-					if cardrive < 20:
-						minut += 75
-						'You spend more than an hour on the highway going to Pavlovsk.'
-					else
-						minut += 15
-						'15 minutes later, you reach your destination.'
-					end
+	if cardrive ! 19 and cardrive < 20:
+		act 'Go to the city train station':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 19
 
-					dynamic $enddrive
-				end
-			end
+			'5 minutes later, you arrive at your destination.'
 
-			act 'Drive the St. Petersburg - Pavlovsk Highway':
-				'You drive out onto the highway.'
-				:oops
-				cla
-				if cardrive < 20:
-					numberRoad = input("How many km toward Pavlovsk do you go (from 0 to 20)")
-				else
-					numroadtemp = input("How many km toward St Petersburg do you go (from 0 to 20)")
-					numberroad = 20 - numroadtemp & killvar 'numroadtemp'
-				end
-				if numberRoad >= 0 and numberRoad <= 20:
-					cardrive = 22
-					nroad = numberRoad
-					ncarroad = numberRoad
-				else
-					'Invalid Entry'
-					jump 'oops'
-				end
+			dynamic $enddrive
+		end
+	end
 
-				xgt 'carF', 'salon'
-			end
+	if cardrive ! 4 and cardrive < 20:
+		act 'Go to the city lake':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 4
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
+		end
+	end
 
-			act 'Drive on the track (1:00)':
-				cla
-				minut += 60
-				benz -= 4
-				teh -= rand(2, 6)
-				pcs_mood += 20
-				wipo += 10
-				'You go to the track and have fun driving around before leaving.'
+	if cardrive ! 5 and cardrive < 20:
+		act 'Go to the city park':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 5
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
+		end
+	end
 
-				act 'Finish':xgt 'carF', 'salon'
-			end
+	if cardrive ! 6 and cardrive < 20:
+		act 'Go to the gas station':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 6
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
+		end
+	end
+
+	if cardrive ! 7 and cardrive < 20:
+		act 'Go to the auto repair shop':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 7
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
+		end
+	end
+
+	if cardrive ! 8 and cardrive < 20:
+		act 'Go to the car dealership':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 8
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
+		end
+	end
+
+	if cardrive ! 25 and cardrive < 20:
+		act 'Go to the island':
+			cla
+			minut += 5
+			benz -= 1
+			teh -= rand(1, 3)
+			cardrive = 25
+			'5 minutes later, you arrive at your destination.'
+			dynamic $enddrive
 		end
 	end
 end