[changed] balanced metro travel time against taxi

locations/Nord.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = '':
 	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">gas station</a> near the street'
 
 	if hour >= 5 and hour <= 23:
-		'The <a href="exec:gt ''metro'', ''start''">metro station</a> is within a 5 minute walk from here.'
+		'The <a href="exec: minut += 5 & gt ''metro'', ''start''">metro station</a> is within a 5 minute walk from here.'
 	else
 		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
 	end

locations/down.qsrc

@@ -110,7 +110,7 @@ act 'Wait':gs 'obj_din', 'wait'
 gs 'taxi'
 
 if hour >= 4 and hour <= 23:
-	$desc_txt1 = '<a href="exec:gt ''metro'', ''start''">the metro</a>'
+	$desc_txt1 = '<a href="exec: minut += 5 & gt ''metro'', ''start''">the metro</a>'
 else
 	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
 end

locations/island.qsrc

@@ -49,7 +49,7 @@ gs 'taxi'
 
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> is a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
-if hour >= 4 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
+if hour >= 4 and hour <= 23:'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'
 if student > 0 or (hour >= 6 and hour <= 23):'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 

locations/metro.qsrc

@@ -26,7 +26,6 @@ if $ARGS[0] = 'start':
 	end
 
 	'The metro fare costs 16 <b>₽</b>.'
-	minut += 5
 	clr
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -47,6 +46,7 @@ if $ARGS[0] = 'start':
 				$loc = 'street'
 				$metka = ''
 				money -= 16
+				minut += 10
 				gt 'metro', 'vagon'
 			end
 		end
@@ -56,6 +56,7 @@ if $ARGS[0] = 'start':
 				$loc = 'down'
 				$metka = ''
 				money -= 16
+				minut += 10
 				gt 'metro', 'vagon'
 			end
 		end
@@ -65,6 +66,7 @@ if $ARGS[0] = 'start':
 				$loc = 'Nord'
 				$metka = ''
 				money -= 16
+				minut += 10
 				gt 'metro', 'vagon'
 			end
 		end
@@ -74,6 +76,7 @@ if $ARGS[0] = 'start':
 				$loc = 'psiklin'
 				$metka = 'start'
 				money -= 16
+				minut += 10
 				gt 'metro', 'vagon'
 			end
 		end
@@ -83,6 +86,7 @@ if $ARGS[0] = 'start':
 				$loc = 'island'
 				$metka = ''
 				money -= 16
+				minut += 10
 				gt 'metro', 'vagon'
 			end
 		end

locations/psiklin.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0]='start':
     '<center><H4>Elite settlement<H4></center>'
     '<left><img <<$set_imgh>> src="images/locations/city/suburb/settlement.jpg" ></left>'
 
-	if hour >= 4 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> station is only a short walk from here from here.'
+	if hour >= 4 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> station is only a short walk from here from here.'
 
     if BDSMClub = 1 or BDSMmeet > 0:
 	    act 'BDSM-club':gt'BDSM_Club','start'

locations/street.qsrc

@@ -113,7 +113,7 @@ else
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 
-if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
+if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
 if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'

locations/taxi.qsrc

@@ -253,7 +253,7 @@ end
 if $ARGS[0] = 'trip':
 	cla
 	*clr
-	minut += 15
+	minut += rand(5,10)
 
 	if workDisk = 3 and konvert = 1:
 		badrand = rand(0, 100)