Timing fixes as pointed out by A+Service

locations/ParChurch

@@ -29,8 +29,10 @@ if $ARGS[0] = 'start':
 	if Churchbad = 3 and Churchbadtime > daystart:
 		cla
 		'The priest would probably still be mad at you. You decide to avoid him and leave.'
-		act 'Return to town':gt 'pavResidential'
-		exit
+		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
+		act 'Go to the high street':minut += 10 & gt 'pavCommercial'
+	exit
+
 	elseif Churchbad = 3 and Churchbadtime <= daystart:
 		Churchbad = 2
 		"You figure that the priest has probably calmed down enough by now that you could talk to him."
@@ -44,7 +46,7 @@ if $ARGS[0] = 'start':
 	end
 	
 	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the high street':minut += 5 & gt 'pavCommercial'
+	act 'Go to the high street':minut += 10 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'vigil':

locations/bank

@@ -1,9 +1,8 @@
 # bank
 if $ARGS[0] = 'start':
 	cla
-	clr
 	*clr
-	minut += 5
+	minut += 2
 	gs 'stat'
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
@@ -56,7 +55,6 @@ if $ARGS[0] = 'start':
 	if money > 0:
 		act 'Deposit money':
 			cla
-			minut += 5
 			kartaIN = input ("How much money you want to deposit into the account?")
 
 			if kartaIN <= 0 or kartaIN > money:
@@ -80,7 +78,6 @@ if $ARGS[0] = 'start':
 	if karta + bankDebtLimit > 0:
 		act 'Withdraw money':
 			cla
-			minut += 5
 			kartaOUT = input ("How much do you want to withdraw from account?")
 
 			if kartaOUT <= 0 or kartaOUT > karta + bankDebtLimit:
@@ -101,7 +98,7 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Leave':
-		minut += 5
+		minut += 2
 		if bankloc = 1:
 			gt 'down'
 		else

locations/barbershop

@@ -86,12 +86,12 @@ if $ARGS[0] = 'start':
 		cls
 		'The barber shop is closed at the moment, you should probably come back, when Mr. Syomin is in'
 
-		act 'Leave':minut += 2 & gt 'pavCommercial'
+		act 'Leave':minut += 3 & gt 'pavCommercial'
 
 		exit
 	end
 
-	act 'Leave':minut += 2 & gt 'pavCommercial'
+	act 'Leave':minut += 3 & gt 'pavCommercial'
 end
 
 if money >= 60:

locations/etoexhib

@@ -779,7 +779,6 @@ end
 if $ARGS[0] = 'pos20':
 	cla
 	*clr
-	minut += 15
 	gs 'stat'
 	'<center><b><font color="maroon">High School</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/lizey.jpg"></center>'
@@ -790,7 +789,7 @@ if $ARGS[0] = 'pos20':
 	if teachlevel > 0 and teachlevel < 10:workPTU = 2
 
 	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':minut += 15 & gt 'pavCommercial'
 end
 
 if $ARGS[0] = 'pos21':

locations/gpoli

@@ -4,7 +4,6 @@ if $ARGS[0] = '':
 	CLOSE ALL
 	clr
 	$loc = 'gpoli'
-	minut += 5
 	frost = 0
 	gs 'stat'
 	if night_mode = 1:
@@ -19,7 +18,7 @@ if $ARGS[0] = '':
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':minut += 5 & gt 'pavCommercial'
 
 	if hour >= 6 and hour <= 21:
 		if gpoliuborka = 0:

locations/pavCommercial

@@ -51,7 +51,7 @@ end
 if Enable_towntable = 1 : $_str += '</td><td>'
 $_str += '<center>The high street of a provincial town in a rural area of Russia.  Population: about 15000 inhabitants.</center>'
 $_str += '<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
-$_str += '<center>The tallest building in town is the <a href="exec:gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
+$_str += '<center>The tallest building in town is the <a href="exec:minut += 10 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
 if Enable_towntable = 1 : $_str += '</td></tr><table></center>'
 *nl $_str
 killvar '$_str'
@@ -97,9 +97,9 @@ else
 	$Pharmname = '.'
 end
 
-'You are on the high street, at one end is the <a href="exec:minut += 15 & gt ''vokzalG''">train station</a> and access to the highway. Near the highway you can also find a <a href="exec:gt ''zaprF'', ''start''">gas station</a>.'
-'The nearby residential area is next to the lake and the town surrounds the old palace grounds which are now a large <a href="exec:gt ''gskver'', ''park''">public park</a>.'
-'There is a small <a href="exec:minut += 15 & gt ''gpoli''">clinic</a><<$Pharmname>>'
+'You are on the high street, at one end is the <a href="exec:minut += 15 & gt ''vokzalG''">train station</a> and access to the highway. Near the highway you can also find a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a>.'
+'The nearby residential area is next to the lake and the town surrounds the old palace grounds which are now a large <a href="exec:minut += 5 & gt ''gskver'', ''park''">public park</a>.'
+'There is a small <a href="exec:minut += 5 & gt ''gpoli''">clinic</a><<$Pharmname>>'
 
 if leonidSlave = 1:
 	'Near the town hall there is an old <a href="exec:minut += 15 & gt ''pavCommercialOffices''">office building</a>.'
@@ -107,10 +107,10 @@ end
 
 
 if hour >= 8 and hour <= 17:'The local <a href="exec: minut += 3 & gt ''barbershop'', ''start''">barbershop</a> is within walking distance, merely a few minutes away.'
-if hour >= 7 and hour <= 18:'Pavlovsk has a <a href="exec:gt ''etoexhib'', ''pos20''">vocational school</a>, where young adults can learn a trade.'
+if hour >= 7 and hour <= 18:'Pavlovsk has a <a href="exec:minut += 15 & gt ''etoexhib'', ''pos20''">vocational school</a>, where young adults can learn a trade.'
 if hour >= 8 and hour <= 20:'There is a big chain <a href="exec:gt ''shop'', ''start''">supermarket</a> nearby.'
 if week < 6 and hour >= 9 and hour <= 18:'You can see the most important <a href="exec:bankloc = 0 & gt ''bank'', ''start''">Bank</a> in the city from here.'
-if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):'The local <a href="exec:bankloc = 0 & gt ''postoffice'', ''start''">post office</a> branch is open.'
+if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):'The local <a href="exec:minut += 3 & bankloc = 0 & gt ''postoffice'', ''start''">post office</a> branch is open.'
 
 'A <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">garment factory</a> named Paris Commune is situated in the industrial area on the outskirts of town, close to the highway.'
 

locations/pavResidential

@@ -46,7 +46,7 @@ end
 if Enable_towntable = 1 : $_str += '</td><td>'
 $_str += '<center>You are in the residential area of a provincial town in a rural area of Russia.  Population: about 15000 inhabitants.</center>'
 $_str += '<center>Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> with its surrounding gardens and forest, built by Catherine the Great, and the recently rebuilt <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> (which is now a Luxury hotel and restaurant), it looks much like all the other towns in the region.</a></center> '
-$_str += '<center>The tallest building in town is the <a href="exec:gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
+$_str += '<center>The tallest building in town is the <a href="exec:minut += 5 & gt ''ParChurch'',''start''">church of St Nikolas.</a></center>'
 if Enable_towntable = 1 : $_str += '</td></tr><table></center>'
 *nl $_str
 killvar '$_str'
@@ -145,7 +145,7 @@ else
 	'.'
 end
 	
-'The town surrounds the old place grounds which are now a large <a href="exec:gt ''gskver'', ''park''">public park</a>, close to the residential area is the <a href="exec:gt ''glake''">lake</a>.'
+'The town surrounds the old place grounds which are now a large <a href="exec:minut += 5 & gt ''gskver'', ''park''">public park</a>, close to the residential area is the <a href="exec:gt ''glake''">lake</a>.'
 
 'The town square features a <a href="exec:gt ''gdk''">community center</a><<$schoolname>>'
 	
@@ -155,20 +155,20 @@ end
 ''
 !!made changes here, to remove direct links to the kids in the apartment complex, make sure this will work with the code left.
 if Enable_tablemap = 0:
-	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:'<a href="exec:minut += 15 & gt ''dimaGoHome2''">Dimka Nosov</a>, one of your classmates, lives in one of the fancier houses in town.'
-	if IgorLoverQW > 0 and IdorBlock = 0:'<a href="exec:minut += 15 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
+	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:'<a href="exec:minut += 10 & gt ''dimaGoHome2''">Dimka Nosov</a>, one of your classmates, lives in one of the fancier houses in town.'
+	if IgorLoverQW > 0 and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	!if katjaFirstKiss >= 1:'<a href="exec:minut += 15 & gt ''KatjaHome''">Katja Meynold</a>, one of your classmates, lives in the richer part of town.'
-	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Large private house where the <a href="exec: gt''mey_home'', ''door''">Meynold twins</a> live.'
-	if LariskaHomeIn > 0: '<a href="exec:minut += 15 & GT ''LariskaHome''">Larissa Gruzdev</a>, one of your classmates, lives about 15 minutes away from your parents.'
-	if beinalbinahome > 0:'<a href="exec:minut += 15 & gt ''albinaporog''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
+	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Large private house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
+	if LariskaHomeIn > 0: '<a href="exec:minut += 10 & GT ''LariskaHome''">Larissa Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
+	if beinalbinahome > 0:'<a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
-	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 15 & gt ''dimaGoHome2''">Dimka Nosov</a>.','3'
-	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 15 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
-	!if katjaFirstKiss >= 1:gs'show_table','house of <a href="exec:minut += 15 & gt ''KatjaHome''">Katja Meynold</a>.','3'
-	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','house of <a href="exec: gt''mey_home'', ''door''">twins Manold</a>.','3'
-	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 15 & GT ''LariskaHome''" >Lariska Gruzdevaya</a>, in richer part','3'
-	if beinalbinahome > 0:gs'show_table','Luxurious mansion of <a href="exec:minut += 15 & gt ''albinaporog''">Albina Barlovskaya</a>.','3'
+	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaGoHome2''">Dimka Nosov</a>.','3'
+	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
+	!if katjaFirstKiss >= 1:gs'show_table','house of <a href="exec:minut += 10 & gt ''KatjaHome''">Katja Meynold</a>.','3'
+	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','house of <a href="exec:minut += 10 & gt''mey_home'', ''door''">twins Manold</a>.','3'
+	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 10 & GT ''LariskaHome''" >Lariska Gruzdevaya</a>, in richer part','3'
+	if beinalbinahome > 0:gs'show_table','Luxurious mansion of <a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>.','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 !!end of code changes.

locations/postoffice

@@ -148,13 +148,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave':
-		if bankloc = 1:
-			gt 'down'
-		else
-			gt 'pavCommercial'
-		end
-	end
+	act 'Leave':$postloc = 'leave' & gt 'postoffice'
 end
 
 if $postloc = 'counter':
@@ -184,15 +178,7 @@ if $postloc = 'counter':
 
 			act 'Yes':$postloc = 'counter' & gt 'postoffice'
 
-			act 'Leave the post office':
-				minut += 5
-				gs 'stat'
-				if bankloc = 1:
-					gt 'down'
-				else
-					gt 'pavCommercial'
-				end
-			end
+			act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
 		end
 	end
 	
@@ -224,15 +210,7 @@ if $postloc = 'counter':
 
 		act 'Yes':$postloc = 'counter' & gt 'postoffice'
 
-		act 'Leave the post office':
-			minut += 5
-			gs 'stat'
-			if bankloc = 1:
-				gt 'down'
-			else
-				gt 'pavCommercial'
-			end
-		end
+		act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
 	end
 	
 	i = 0
@@ -295,15 +273,7 @@ if $postloc = 'counter':
 
 					act 'Yes':$postloc = 'counter' & gt 'postoffice'
 
-					act 'Leave the post office':
-						minut += 5
-						gs 'stat'
-						if bankloc = 1:
-							gt 'down'
-						else
-							gt 'pavCommercial'
-						end
-					end
+					act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
 				end
 			end
 		end
@@ -326,14 +296,17 @@ if $postloc = 'counter':
 !!		end
 !!	end
 
-	act 'Leave':
-		minut += 5
-		gs 'stat'
-		if bankloc = 1:
-			gt 'down'
-		else
-			gt 'pavCommercial'
-		end
+	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+end
+
+
+if $postloc = 'leave':
+	minut += 3
+	killvar '$postloc'
+	if bankloc = 1:
+		gt 'down'
+	else
+		gt 'pavCommercial'
 	end
 end
 

locations/shop

@@ -23,7 +23,7 @@ if $shoplocation = 'main':
 	if hour < 8 or hour > 20:
 		'The supermarket is currently closed.'
 
-		act 'Leave the store':gt $loc
+		act 'Leave the store':minut += 1 & gt $loc
 		exit
 	end
 

locations/zaprF

@@ -7,7 +7,6 @@ if $ARGS[0] = 'start':
 	$location_type = 'public_outdoors'
 	cla
 	*clr
-	minut += 5
 	gs 'stat'
 	'<center><b>Gas Station</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/gas/zapr.jpg"></center>'
@@ -72,10 +71,12 @@ if $ARGS[0] = 'start':
 		if cardrive = 6:
 			gt 'nord'
 		elseif cardrive = 21:
+			minut += 5
 			gt 'pavCommercial'
 		elseif litltown = 0:
 			gt 'nord'
 		elseif litltown = 1:
+			minut += 5
 			gt 'pavCommercial'
 		end
 	end