Browse Source

[changed] standardised movement actions in pavCommerical, pavComplex, pavResidential, pavTrain, shulgahall.

3xpurt 5 years ago
parent
commit
1761a03d70

+ 3 - 1
locations/pavCommercial.qsrc

@@ -139,7 +139,9 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
-act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
+
+act 'Walk to the train station':minut += 15 & gt 'pavtrain'
 
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 

+ 1 - 1
locations/pavComplex.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if home_owned[2] = 1: act '<b>Go home</b> (Parents'' Apartment)': minut += 5 & GT 'korrPar'
-	act 'Return to the residential street':minut += 2 & gt 'pavResidential'
+	act 'Walk to the residential street':minut += 2 & gt 'pavResidential'
 	act 'Go to the Southern apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	act 'Go to the Eastern apartment building':
 		minut += 1

+ 5 - 4
locations/pavResidential.qsrc

@@ -185,11 +185,12 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Go to the high street':minut += 5 & gt 'pavCommercial'
-if home_owned[2] = 1: act '<b>GO HOME</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
-if pavSharedAptEnabled = 1:act '<b>GO HOME</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
+if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & GT 'korrPar'
+if pavSharedAptEnabled = 1:act '<b>Go Home</b> (Shared Apartment)': minut += 5 & GT 'pavSharedApt', 'start'
 
-act 'Go to the apartment complex':minut += 2 & gt 'pavcomplex', 'start'
+act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+
+act 'Walk to the apartment complex':minut += 2 & gt 'pavcomplex', 'start'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 1 - 1
locations/pavtrain.qsrc

@@ -152,7 +152,7 @@ end
 gs 'family'
 
 act 'Enter the train station': gt 'pavtrainhall'
-act 'Go to Pavlovsk high street':minut += 15 & gt 'pavCommercial'
+act 'Walk to the commerical area':minut += 15 & gt 'pavCommercial'
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 
 --- pavtrain ---------------------------------

+ 1 - 1
locations/shulgahall.qsrc

@@ -47,6 +47,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
+	act 'Leave the apartment':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
 
 	act 'Go to the living room': gt 'shulga_room', 'start','hall'
 	if instr($maintxt,'hear') > 0:
@@ -56,7 +57,6 @@ if $ARGS[0] = '':
 	end
 	act 'Go to the bathroom': gt 'shulgabath', 'start'
 	act 'Go to the kitchen': gt 'shulgakuh',instr($maintxt,'hear')
-	act 'Leave':minut += 1 & killvar '$boy' & gt'pod_ezd','etaj_3'
 end &!--- main ---
 
 if $ARGS[0] = 'shulga_home_momgg1':