Pushkin now merged into Pav as old town. Train station for Pav now serves both and driving there goes through Pav menu

locations/carF.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'salon':
 	if cardrive = 11:'Through the windshield, you can see the sauna.'
 	if cardrive = 12:'Through the windshield, you see a construction site.'
 	if cardrive = 13:'Through the windshield, you can see the suburban cooperative.'
-	if cardrive = 14:'Through the windshield, you see the Old Town (Pushkin).'
+	if cardrive = 14:'Through the windshield, you see the Old Town district of Pavlovsk.'
 	if cardrive = 18:'Through the windshield, you can see your mansion.'
 	if cardrive = 19:'Through the windshield, you see the city industrial region train station.'
 	if cardrive = 20:'Through the windshield, you can see Pavlovsk''s residential area.'
@@ -277,24 +277,6 @@ if $ARGS[0] = 'other':
 		end
 	end
 
-	if cardrive ! 14:
-		act 'Go to Old Town (Pushkin)':
-			cla
-			if car_town ! 0:
-				minut += 60
-				'It takes about an hour to get to Old Town (Pushkin).'
-			else
-				minut += 5
-				'5 minutes later, you reach Old Town (Pushkin).'
-			end
-			benz -= 1
-			teh -= rand(2, 5)
-			cardrive = 14
-
-			dynamic $enddrive
-		end
-	end
-
 	if cardrive ! 23:
 		act 'Go to the village of Gadukino':
 			cla
@@ -368,6 +350,19 @@ if $ARGS[0] = 'pav':
 		end
 	end
 
+	if cardrive ! 14:
+		act 'Go to Old Town district of Pavlovsk':
+			cla
+			benz -= 1
+			teh -= rand(2, 5)
+			cardrive = 14
+			minut += 5
+			'5 minutes later, you reach Old Town district of Pavlovsk.'
+
+			dynamic $enddrive
+		end
+	end
+
 	if cardrive ! 21:
 		act 'Go to the gas station':
 			cla

locations/cityTrain.qsrc

@@ -118,15 +118,6 @@ if $ARGS[0] = 'buy_ticket':
 		end
 	end
 
-	act 'Buy a ticket to the old town (125 <b>₽</b>)':
-		if money >= 125:
-			money -= 125
-			gt 'cityTrain', 'oldtown'
-		else
-			'You don''t have enough money for this ticket.'	
-		end
-	end
-
 	act 'Buy a ticket to Pavlovsk (150 <b>₽</b>)':
 		if money >= 150:
 			money -= 150
@@ -154,8 +145,6 @@ if $ARGS[0] = 'platform':
 
 	act 'Take a train to the village of Gadukino': gt 'cityTrain', 'village'
 
-	act 'Take a train to the old town': gt 'cityTrain', 'oldtown'
-
 	act 'Take a train to Pavlovsk': gt 'cityTrain', 'pavlovsk'
 end
 
@@ -208,24 +197,6 @@ if $ARGS[0] = 'village':
 	end
 end
 
-if $ARGS[0] = 'oldtown':
-	$loc = 'train'
-	$metka = 'oldtown'
-	menu_off = 1
-	minut += 35
-	if rand(1, 100) < 15: gt 'train', 'private'
-	if rand(1, 100) < 30: gt 'train', 'Gopnik'
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'After 35 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'oldtown'
-	end
-end
-
 if $ARGS[0] = 'pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'

locations/fame.qsrc

@@ -2,10 +2,11 @@
 
 !!For adding to the PC fame, the call will look a bit like so:
 !!gs 'fame', 'pav', 'dance', 5
-!!$ARGS [0] is for the location: pav, city, oldtown or village
+!!$ARGS [0] is for the location: pav, city or village
 !!$ARGS [1] is for the act that is adding to fame, listed below:
 !!acting, dance, painting, music, ballet, modelling, porn, stripping, prostitute, sex, kickboxing, running, volleyball, chess, teaching
-!!ARGS[2] is the value of the increase and should be an integer, its hard to put a value on fame but lets go with 1-5 for a little to a lot
+!!ARGS[2] is the value of the increase and should be an integer, its hard to put a value on fame but lets go with:
+!! 1-5 for small regular stuff and 10-50 for things with big impact like modelling
 
 if $ARGS[0] ! 'deg':
 
@@ -98,9 +99,6 @@ if $ARGS[0] ! 'deg':
 		$fametown = 'city'
 		jump 'fametownloop'
 	elseif $fametown = 'city':
-		$fametown = 'oldtown'
-		jump 'fametownloop'
-	elseif $fametown = 'oldtown':
 		$fametown = 'village'
 		jump 'fametownloop'
 	end
@@ -119,14 +117,11 @@ if $ARGS[0] ! 'deg':
 		$fametown = 'city'
 		jump 'fametownloop2'
 	elseif $fametown = 'city':
-		$fametown = 'oldtown'
-		jump 'fametownloop2'
-	elseif $fametown = 'oldtown':
 		$fametown = 'village'
 		jump 'fametownloop2'
 	end
 
-	pcs_fame = pav_fame + city_fame + oldtown_fame + village_fame
+	pcs_fame = pav_fame + city_fame + village_fame
 	
 	$gnikname = ''
 	if pav_slut > 25:
@@ -178,9 +173,6 @@ if $ARGS[0] = 'deg':
 		$fametown = 'city'
 		jump 'famedegloop'
 	elseif $fametown = 'city':
-		$fametown = 'oldtown'
-		jump 'famedegloop'
-	elseif $fametown = 'oldtown':
 		$fametown = 'village'
 		jump 'famedegloop'
 	end

locations/gskver.qsrc

@@ -94,6 +94,7 @@ if $ARGS[0] = 'start':
 
 	act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
 	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Old Town':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commerical</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'

locations/liam.qsrc

@@ -64,6 +64,9 @@ end
 
 if arts = 1:'Apartment <a href="exec:gt ''Marin'',''start''">Marina</a>'
 
+
+act 'Walk to the train station (15 min)':minut += 5 & nroad = 15 & gt'pavTrain'
+act 'Walk to Pavlovsk park (10 min)':minut += 5 & nroad = 10 & gt'gskver'
 act 'Walk to the St Petersburg to Pavlovsk road (5 min)':minut += 5 & nroad = 15 & gt'road'
 
 act 'Wait':gs 'obj_din', 'wait'

locations/nordtrain.qsrc

@@ -72,8 +72,6 @@ if $ARGS[0] = 'platform':
 		
 		act 'Take a train to the village of Gadukino': gt 'nordtrain', 'village'
 		
-		act 'Take a train to the old town': gt 'nordtrain', 'oldtown'
-		
 		act 'Take a train to Pavlovsk': gt 'nordtrain', 'pavlovsk'
 	end
 end
@@ -171,13 +169,6 @@ if $ARGS[0] = 'buy_ticket':
 		end
 	end
 
-	if money >= 100:
-		act 'Buy a ticket to the old town (100 <b>₽</b>)':
-			money -= 100
-			gt 'nordtrain', 'oldtown'
-		end
-	end
-
 	if money >= 125:
 		act 'Buy a ticket to Pavlovsk (125 <b>₽</b>)':
 			money -= 125
@@ -234,22 +225,6 @@ if $ARGS[0] = 'village':
 	end
 end
 
-if $ARGS[0] = 'oldtown':
-	$loc = 'train'
-	$metka = 'oldtown'
-	menu_off = 1
-	minut += 30
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) < 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'After 30 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'oldtown'
-	end
-end
-
 if $ARGS[0] = 'pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'

locations/pavtrain.qsrc

@@ -179,6 +179,8 @@ gs 'family'
 
 act 'Walk to the commerical area':minut += 10 & gt 'pavCommercial'
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
+act 'Walk to the old town':minut += 15 & nroad = 19 & gt 'liam'
+
 act 'Enter the station building': gt 'pavtrainhall'
 
 --- pavtrain ---------------------------------

locations/pavtrainhall.qsrc

@@ -133,7 +133,6 @@ if $ARGS[0] = 'platform':
 	act 'Enter the station building': gt'pavtrainhall'
 
 	if Trainpass_day > daystart:
-		act 'Take the train to the old town': gt 'pavtrainhall', 'oldtown'
 
 		act 'Take the train to the village of Gadukino': gt 'pavtrainhall', 'village'
 
@@ -241,13 +240,6 @@ if $ARGS[0] = 'buy_ticket':
 
 	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
 
-	if money >= 50:
-		act 'Buy a ticket to the old town (50 <b>₽</b>)':
-			money -= 50
-			gt 'pavtrainhall', 'oldtown'
-		end
-	end
-
 	if money >= 75:
 		act 'Buy a ticket to the village of Gadukino (75 <b>₽</b>)':
 			money -= 75
@@ -277,21 +269,6 @@ if $ARGS[0] = 'buy_ticket':
 	end
 end
 
-if $ARGS[0] = 'oldtown':
-	$loc = 'train'
-	$metka = 'oldtown'
-	menu_off = 1
-	minut += 5
-	if rand(1, 100) < 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'After 5 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
-	act 'Get off the train':
-		if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'oldtown'
-	end
-end
-
 if $ARGS[0] = 'village':
 	$loc = 'train'
 	$metka = 'village'

locations/road.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = '':
 	elseif nroad = 14:
 		''
 	elseif nroad = 15:
-		'You see a <a href="exec:gt ''train'', ''oldtown''">railway platform</a> not far from the road. You are on the outskirts of the old town of <a href="exec:minut += 15 & gt ''liam''">Pushkin</a> about a five minutes down a cobblestone road is the old town center. It''s a fairly popular town for tourists to explore, much of its old architecture is still intact.'
+		''
 	elseif nroad = 16:
 		'All you see is an abandoned building, not too far from the road. From the look of it, the heavy fences around the building will make it difficult for you to get anywhere near it.'
 	elseif nroad = 17:
@@ -131,9 +131,9 @@ if $ARGS[0] = '':
 	elseif nroad = 18:
 		''
 	elseif nroad = 19:
-		''
+		'You are on the outskirts of the <a href="exec:minut += 15 & gt ''liam''">old town</a> district of Pavlovsk about a five minutes down a cobblestone road is the old town center. It''s a fairly popular for tourists to explore with much of its old architecture still intact.'
 	elseif nroad = 20:
-		'The main road ends at the old provincial town of Pavlovsk. You can see the castle from a distance.'
+		'The main road ends at the provincial town of Pavlovsk. You can see the castle in the distance.'
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to St. Petersburg, for a price...'
 		'A small road leads to an almost hidden old <a href="exec:gt ''brothel'', ''lobby''">hotel</a>. Usually tourists use it when passing by or when visiting the old town of Pavlovsk.'
 	end

locations/train.qsrc

@@ -55,17 +55,7 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
-	
-	act 'Buy a ticket to the old platform by the old town (75 <b>₽</b>)':
-		if money >= 75:
-			money -= 75
-			menu_off = 1
-			gt 'train', 'communal_oldtown'
-		else
-			'You don''t have enough money for this ticket.'
-		end
-	end
-	
+
 	act 'Buy a ticket to Pavlovsk (100 <b>₽</b>)':
 		if money >= 100:
 			money -= 100
@@ -90,8 +80,6 @@ if $ARGS[0] = 'communal_trains':
 	
 	act 'Take a train to the village of Gadukino': gt 'train', 'communal_village'
 	
-	act 'Take a train to the old platform by the old town': gt 'train', 'communal_oldtown'
-	
 	act 'Take a train to Pavlovsk': gt 'train', 'communal_pavlovsk'
 end
 
@@ -143,22 +131,6 @@ if $ARGS[0] = 'communal_village':
 	end
 end
 
-if $ARGS[0] = 'communal_oldtown':
-	$loc = 'train'
-	$metka = 'oldtown'
-	minut += 20
-	menu_off = 1
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'After 20 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'oldtown'
-	end
-end
-
 if $ARGS[0] = 'communal_pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
@@ -234,17 +206,7 @@ if $ARGS[0] = 'village_tickets':
 			'You don''t have enough money for this ticket.'	
 		end
 	end	
-	
-	act 'Buy a ticket to the old town (50 <b>₽</b>)':
-		if money >= 50:
-			money -= 50
-			menu_off = 1
-			gt 'train', 'village_oldtown'
-		else
-			'You don''t have enough money for this ticket.'	
-		end
-	end
-	
+
 	act 'Buy a ticket to Pavlovsk (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -269,8 +231,6 @@ if $ARGS[0] = 'village_trains':
 
 	act 'Take a train to the communal village': gt 'train', 'village_communal'
 
-	act 'Take a train to the old town': gt 'train', 'village_oldtown'
-
 	act 'Take a train to Pavlovsk': gt 'train', 'village_pavlovsk'
 end
 
@@ -321,21 +281,6 @@ if $ARGS[0] = 'village_communal':
 	end
 end
 
-if $ARGS[0] = 'village_oldtown':
-	$loc = 'train'
-	$metka = 'oldtown'
-	minut += 10
-	menu_off = 1
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'After 10 minutes, the train stops at old platform by the old town of Pushkin. Famous for its extensive park and old historic buildings, the locals are known to be eccentric but that adds to the charm.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'oldtown'
-	end
-end
-
 if $ARGS[0] = 'village_pavlovsk':
 	$loc = 'pavtrainhall'
 	$metka = 'platform'
@@ -355,181 +300,6 @@ if $ARGS[0] = 'village_pavlovsk':
 	end
 end
 
-if $ARGS[0] = 'oldtown':
-	*clr & cla
-	$menu_loc = 'train'
-	$menu_arg = 'oldtown'
-	menu_off = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pushplat.jpg" ></center>'
-	'A fairly modern railway platform. The old town of Pushkin is just a five minute walk away from here, on the other side of the road.'
-
-	act 'Return to the road':minut += 15 & nroad = 15 & gt 'road'
-	*nl
-	if Trainpass_day > daystart:
-		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to platforms': gt 'train', 'oldtown_trains'
-	else
-		act 'Buy a ticket': gt 'train', 'oldtown_tickets'
-	end
-end
-
-if $ARGS[0] = 'oldtown_tickets':
-	$menu_loc = 'train'
-	$menu_arg = 'oldtown_tickets'
-	menu_off = 0
-	
-	act 'Leave the ticket office': gt 'train', 'oldtown'
-	
-	act 'Buy a ticket to St. Petersburg city center (125 <b>₽</b>)':
-		if money >= 125:
-			money -= 125
-			menu_off = 1
-			gt 'train', 'oldtown_centre'
-		else
-			'You don''t have enough money for this ticket.'
-		end
-	end
-	
-	act 'Buy a ticket to St. Petersburg city industrial area (100 <b>₽</b>)':
-		if money >= 100:
-			money -= 100
-			menu_off = 1
-			gt 'train', 'oldtown_ind'
-		else
-			'You don''t have enough money for this ticket.'
-		end
-	end	
-	
-	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
-		if money >= 75:
-			money -= 75
-			menu_off = 1
-			gt 'train', 'oldtown_communal'
-		else
-			'You don''t have enough money for this ticket.'
-		end
-	end
-	
-	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
-		if money >= 50:
-			money -= 50
-			menu_off = 1
-			gt 'train', 'oldtown_village'
-		else
-			'You don''t have enough money for this ticket.'	
-		end
-	end
-	
-	act 'Buy a ticket to Pavlovsk (50 <b>₽</b>)':
-		if money >= 50:
-			money -= 50
-			menu_off = 1
-			gt 'train', 'oldtown_pavlovsk'
-		else
-			'You don''t have enough money for this ticket.'	
-		end
-	end	
-end
-
-if $ARGS[0] = 'oldtown_trains':
-	$menu_loc = 'train'
-	$menu_arg = 'oldtown_trains'
-	menu_off = 0
-	
-	act 'Leave the platform': gt 'train', 'oldtown'
-
-	act 'Take a train to St. Petersburg city center': gt 'train', 'oldtown_centre'
-
-	act 'Take a train to St. Petersburg city industrial area': gt 'train', 'oldtown_ind'
-
-	act 'Take a train to the old platform by the communal village': gt 'train', 'oldtown_communal'
-
-	act 'Take a train to the village of Gadukino': gt 'train', 'oldtown_village'
-
-	act 'Take a train to Pavlovsk': gt 'train', 'oldtown_pavlovsk'
-end
-
-if $ARGS[0] = 'oldtown_centre':
-	$loc = 'cityTrain'
-	$metka = 'inside'
-	minut += 35
-	menu_off = 1
-	if rand(1, 100) < 15: gt 'train', 'private'
-	if rand(1, 100) < 30: gt 'train', 'Gopnik'
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/cityplat.jpg" ></center>'
-	'After 35 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'cityTrain', 'inside'
-	end
-end
-
-if $ARGS[0] = 'oldtown_ind':
-	$loc = 'nordtrain'
-	$metka = 'platform'
-	minut += 30
-	menu_off = 1
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
-	'After 30 minutes, the train stops at the St. Petersburg city industrial area station.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'nordtrain', 'platform'
-	end
-end
-
-if $ARGS[0] = 'oldtown_communal':
-	$loc = 'train'
-	$metka = 'communal'
-	minut += 20
-	menu_off = 1
-	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/oldplat.jpg" ></center>'
-	'After 20 minutes you arrive at an old railway platform near the communal village.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'communal'
-	end
-end
-
-if $ARGS[0] = 'oldtown_village':
-	$loc = 'train'
-	$metka = 'village'
-	minut += 10
-	menu_off = 1
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
-	'After 10 minutes, the train stops at the small station near the village of Gadukino.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'train', 'village'
-	end
-end
-
-if $ARGS[0] = 'oldtown_pavlovsk':
-	$loc = 'pavtrainhall'
-	$metka = 'platform'
-	minut += 5
-	menu_off = 1
-	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
-	if rand(1, 100) <= 20: gt 'train', 'events'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
-	'After 5 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
-	act 'Get off the train':
-		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'pavtrainhall', 'platform'
-	end
-end
 
 if $ARGS[0] = 'events':
 	event_random = rand(15, 100)