Browse Source

[fixed] metro time not displayed correctly, because I was a dumb dumb. Reported by Awesome

anjuna krokus 2 months ago
parent
commit
56948b6d1e
1 changed files with 11 additions and 11 deletions
  1. 11 11
      locations/metro.qsrc

+ 11 - 11
locations/metro.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	elseif $loc = 'city_suburbs':
 		'<center><b><font color="maroon">City Suburbs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platsuburb.jpg"></center>'
-	elseif $loc = 'city_island': 
+	elseif $loc = 'city_island':
 		'<center><b><font color="maroon">Vasilyevsky Island</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platisland.jpg"></center>'
 	end
@@ -45,10 +45,10 @@ if $ARGS[0] = 'start':
 	end
 
 	if $loc = 'city_suburbs': act 'Walk to the bus stop (0:15)': minut += 15 & gt 'bus', 'suburbs'
-	
+
 	if money >= 16:
 		if $loc ! 'city_residential':
-			act 'Go to the Residential Area ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
+			act 'Go to the Residential Area (0:10 - 16 <b>₽</b>)':
 				$loc = 'city_residential'
 				$loc_arg = ''
 				money -= 16
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_center':
-			act 'Go to the City Center ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
+			act 'Go to the City Center (0:10 - 16 <b>₽</b>)':
 				$loc = 'city_center'
 				$loc_arg = ''
 				money -= 16
@@ -68,7 +68,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_industrial':
-			act 'Go to the City Industrial Region ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
+			act 'Go to the City Industrial Region (0:10 - 16 <b>₽</b>)':
 				$loc = 'city_industrial'
 				$loc_arg = ''
 				money -= 16
@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_suburbs':
-			act 'Go to the City Suburbs ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
+			act 'Go to the City Suburbs (0:10 - 16 <b>₽</b>)':
 				$loc = 'city_suburbs'
 				$loc_arg = 'start'
 				money -= 16
@@ -88,7 +88,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_island':
-			act 'Go to Vasilyevsky Island ('+func('time', 'get_time_string', 0, 10, cheatVars['time_format'])+' - 16 <b>₽</b>)':
+			act 'Go to Vasilyevsky Island (0:10 - 16 <b>₽</b>)':
 				$loc = 'city_island'
 				$loc_arg = ''
 				money -= 16
@@ -99,7 +99,7 @@ if $ARGS[0] = 'start':
 	else
 		'You don''t have enough money to pay for the metro.'
 	end
-	
+
 	if pusher = 1 and dealer = 0:
 		dealer = 1
 		'You see a tall, emaciated man leaning against the wall next to the tracks, looking very shady. He notices you looking and beckons you to come closer.'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'vagon':
 			if rand(1,100) >= 80: gt 'metro_events', 'station'
 		else
 			if rand(1,100) >= 90: gt 'metro_events', 'station'
-		end			
+		end
 		gt 'metro', 'start'
 	end
 end
@@ -209,8 +209,8 @@ end
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
-	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."' 
-	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.' 
+	'He sizes you up with suspicion. "Hey there. Saw you buying Lady in the park." He clears his throat and spits onto the tracks. "That shit will mess you up."'
+	'He opens his coat and you flinch, thinking he''s going to flash you, but instead see that he''s wearing a business suit underneath.'
 	'He gestures at numerous pockets lining the insides of his coat, filled to bursting with various packages, pills and ampules. "Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."'
 	act 'Continue': gt 'metro','shop'
 end