Procházet zdrojové kódy

[removed/changed] unnecessary `nroad` settings for pushkin and moved it to the act in `abduction`

anjuna krokus před 3 týdny
rodič
revize
fe5f489a38

+ 4 - 5
locations/abduction.qsrc

@@ -545,7 +545,6 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	'On your left, you can see the dust and pollution of what could be a large city.'
 	'On your left, you can see the dust and pollution of what could be a large city.'
 	'You can''t see anything to your right, but something is pulling you that way...'
 	'You can''t see anything to your right, but something is pulling you that way...'
 	'You decide to...'
 	'You decide to...'
-	nroad = 12
 	minut += 180
 	minut += 180
 	if pcs_hydra >= 100:
 	if pcs_hydra >= 100:
 		pcs_hydra -= 25
 		pcs_hydra -= 25
@@ -564,10 +563,10 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	mc_inventory['razor'] =  stanok_bak
 	mc_inventory['razor'] =  stanok_bak
 	mc_inventory['deodorant'] =  deodorant_bak
 	mc_inventory['deodorant'] =  deodorant_bak
 
 
-	act 'Turn and run the opposite direction':gt 'road'
-	act 'Run left':gt 'city_industrial'
-	act 'Run right':gt 'pav_commercial'
-	act 'Run forward':gt 'city_lake', 'start'
+	act 'Turn and run the opposite direction': nroad = 12 & gt 'road'
+	act 'Run left': gt 'city_industrial'
+	act 'Run right': gt 'pav_commercial'
+	act 'Run forward': gt 'city_lake', 'start'
 end
 end
 
 
 if $ARGS[0] = 'abdFood':
 if $ARGS[0] = 'abdFood':

+ 1 - 2
locations/brothel.qsrc

@@ -65,8 +65,7 @@ if $ARGS[0] = 'lobby':
 	'Next to a bar are doors leading to a <a href="exec:gt ''brothel'', ''toilet''">toilet</a>.'
 	'Next to a bar are doors leading to a <a href="exec:gt ''brothel'', ''toilet''">toilet</a>.'
 	*nl
 	*nl
 	'Alongside the windows are tables, each for about four to six people.'
 	'Alongside the windows are tables, each for about four to six people.'
-	nroad = 20
-	act 'Leave the hotel':gt 'road'
+	act 'Leave the hotel': nroad = 20 & gt 'road'
 	act 'Visit the hotel bar': gt 'brothel', 'bar'
 	act 'Visit the hotel bar': gt 'brothel', 'bar'
 	act 'Visit the bathroom': gt 'brothel', 'toilet'
 	act 'Visit the bathroom': gt 'brothel', 'toilet'
 end
 end

+ 1 - 1
locations/pav_commercial.qsrc

@@ -153,7 +153,7 @@ act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
 act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the park (0:05)':minut += 5 & gt 'pav_park', 'start'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:25)':minut += 25 & gt 'pushkin'
 
 
 gs 'music_actions', 'music_icon'
 gs 'music_actions', 'music_icon'
 
 

+ 1 - 1
locations/pav_complex.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
+	act 'Walk to Pushkin (0:30)':minut += 30 gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):

+ 1 - 1
locations/pav_industrial.qsrc

@@ -80,7 +80,7 @@ act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 
 
 if week < 7 and hour >= 8 and hour < 18: 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'pav_factory', 'tailor'
 	act 'Visit the tailor': gt 'pav_factory', 'tailor'

+ 1 - 1
locations/pav_market.qsrc

@@ -312,7 +312,7 @@ act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
-act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'pushkin'
+act 'Walk to Pushkin (0:20)':minut += 20 & gt 'pushkin'
 
 
 gs 'camera', 'check_location'
 gs 'camera', 'check_location'
 
 

+ 1 - 1
locations/pav_train_hall.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = '':
 	act 'Walk to the Industrial region (0:15)': minut += 15 & gt 'pav_industrial'
 	act 'Walk to the Industrial region (0:15)': minut += 15 & gt 'pav_industrial'
 	act 'Walk to the Five Eight estate (0:15)': minut += 15 & gt 'pav_complex', 'start'
 	act 'Walk to the Five Eight estate (0:15)': minut += 15 & gt 'pav_complex', 'start'
 	act 'Walk to the highway (0:15)': minut += 15 & nroad = 20 & gt 'road'
 	act 'Walk to the highway (0:15)': minut += 15 & nroad = 20 & gt 'road'
-	act 'Walk to Pushkin (0:15)': minut += 15 & nroad = 19 & gt 'pushkin'
+	act 'Walk to Pushkin (0:15)': minut += 15 & gt 'pushkin'
 	act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pavstation'
 	act 'Walk to the bus station (0:02)': minut += 2 & gt 'bus', 'pavstation'
 
 
 	if transportVars['trainpass_day'] > daystart:
 	if transportVars['trainpass_day'] > daystart: