Browse Source

[fixed] made the movement between pavlovsks districts time consistent

julzor 4 years ago
parent
commit
6db720cb2b

+ 3 - 3
locations/gskver.qsrc

@@ -92,9 +92,9 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-	act 'Walk to the Old Town':minut += 10 & gt 'liam'
+	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Old Town (0:10)':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'

+ 4 - 5
locations/liam.qsrc

@@ -56,7 +56,7 @@ if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
 		gs'dibodi'
 
 		'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-		'Suddenly you notice a girlfriend from the local hangouts Marinka, I am standing at the door.'
+		'Suddenly you notice a girl from the local hangouts Marinka, I am standing at the door.'
 
 		act 'Ask':gt 'dibodi', 'sptusa'
 	end
@@ -64,10 +64,9 @@ end
 
 if arts = 1:'Apartment <a href="exec:gt ''Marin'',''start''">Marina</a>'
 
-
-act 'Walk to the train station (15 min)':minut += 5 & nroad = 15 & gt 'pavTrain'
-act 'Walk to Pavlovsk park (10 min)':minut += 5 & nroad = 10 & gt 'gskver', 'start'
-act 'Walk to the St Petersburg to Pavlovsk road (5 min)':minut += 5 & nroad = 15 & gt 'road'
+act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pavTrain'
+act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'gskver', 'start'
+act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 5 - 5
locations/pavCommercial.qsrc

@@ -141,11 +141,11 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
-act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the train station':minut += 15 & gt 'pavtrain'
-act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pavcomplex', 'start'
+act 'Walk to the train station (0:10)':minut += 10 & gt 'pavtrain'
+act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 3 - 3
locations/pavComplex.qsrc

@@ -143,9 +143,9 @@ if $ARGS[0] = 'start':
 	
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pavSharedApt', 'start'
-	act 'Walk to the residential area':minut += 2 & gt 'pavResidential'
-	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-	act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
+	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pavResidential'
+	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif storyline = 1 and (home_owned[2] = 0 or pavSharedAptEnabled = 1):

+ 3 - 3
locations/pavIndustrial.qsrc

@@ -81,9 +81,9 @@ else
 	*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
 end
 
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pavcomplex', 'start'
+act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'Gshveyfab', 'tailor'

+ 3 - 3
locations/pavResidential.qsrc

@@ -143,9 +143,9 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
-act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pavcomplex', 'start'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 3 - 3
locations/pavtrain.qsrc

@@ -177,9 +177,9 @@ end
 
 gs 'family'
 
-act 'Walk to the Commercial area':minut += 10 & gt 'pavCommercial'
-act 'Walk to the City Highway':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to the Old Town':minut += 15 & nroad = 19 & gt 'liam'
+act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pavCommercial'
+act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the Old Town (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 act 'Enter the station building': gt 'pavtrainhall'