More renaming. All the train stations renamed plus the lake path

glife.qproj

@@ -268,7 +268,7 @@
 		<Location name="city_kavkazkafe"/>
 		<Location name="city_jorahouse"/>
 		<Location name="city_lake"/>
-		<Location name="dort"/>
+		<Location name="city_lake_path"/>
 		<Location name="city_drugden"/>
 		<Location name="city_bobka"/>
 		<Location name="city_park"/>
@@ -673,11 +673,11 @@
 		<Location name="volAndGev"/>
 	</Folder>
 	<Folder name="Station Campus">
-		<Location name="pavtrain"/>
-		<Location name="pavtrainhall"/>
-		<Location name="pavtrainhall_events"/>
-		<Location name="pavtrain_market"/>
-		<Location name="pavstation"/>
+		<Location name="pav_train"/>
+		<Location name="pav_train_hall"/>
+		<Location name="pav_train_hall_events"/>
+		<Location name="pav_train_market"/>
+		<Location name="pav_station"/>
 		<Location name="katalkin"/>
 		<Location name="katalkinSex"/>
 		<Location name="katalkinAlko"/>
@@ -744,7 +744,7 @@
 	</Folder>
 	<Folder name="City Center">
 		<Location name="city_center"/>
-		<Location name="cityTrain"/>
+		<Location name="city_train"/>
 		<Location name="agentned"/>
 		<Location name="kameraKPZ"/>
 		<Location name="bass"/>
@@ -794,7 +794,7 @@
 	</Folder>
 	<Folder name="North Side">
 		<Location name="city_industrial"/>
-		<Location name="nordtrain"/>
+		<Location name="city_industrial_train"/>
 		<Location name="Terminal"/>
 		<Location name="TerminalOffice"/>
 		<Location name="ivanRoom"/>

locations/HotelHole.qsrc

@@ -20,7 +20,7 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
-		act 'Go back to the High Street':minut += 3 & gt'pavtrain'
+		act 'Go back to the High Street':minut += 3 & gt'pav_train'
 		
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'
@@ -125,7 +125,7 @@ if hour >= 12 and hour <= 13 and GermanQW > 0: 'Next to the reception desk, you
 
 if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and watch the guests checking in an out.' & hotwait = 0
 
-act 'Leave the hotel':minut += 3 & gt'pavtrain'
+act 'Leave the hotel':minut += 3 & gt'pav_train'
 
 if maidqw >= 1 and hour >= 16 and hour < 17:
 	act'<b>Work as a maid</b>':

locations/arturQW.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'arturQW_1':
 					gs 'willpower', 'sex', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'pavtrain_market', 'start'
+					gt 'pav_train_market', 'start'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -50,7 +50,7 @@ if $ARGS[0] = 'arturQW_1':
 					gs 'willpower', 'sex', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'pavtrain_market', 'start'
+					gt 'pav_train_market', 'start'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'arturQW_1':
 				gs 'willpower', 'sex', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'pavtrain_market', 'start'
+				gt 'pav_train_market', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -108,7 +108,7 @@ if $ARGS[0] = 'arturQW_2':
 				gs 'willpower', 'sex', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'pavtrain_market', 'start'
+				gt 'pav_train_market', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -130,7 +130,7 @@ if $ARGS[0] = 'arturQW_2':
 				gs 'willpower', 'sex', 'resist', 'hard'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'pavtrain_market', 'start'
+				gt 'pav_train_market', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/arturRinok.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 							gs 'willpower', 'drink', 'resist'
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'pavtrain_market', 'start'
+							gt 'pav_train_market', 'start'
 						end
 					else
 						act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 								gs 'willpower', 'drink', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pavtrain_market', 'start'
+								gt 'pav_train_market', 'start'
 							end
 						else
 							act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 						gs 'willpower', 'bj', 'resist', 'hard'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pavtrain_market', 'start'
+						gt 'pav_train_market', 'start'
 					end
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 				'Arthur smiles kindly at you. "There is much work to do, I''m sorry."'
 
-				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Leave':gt 'pav_train_market', 'start'
 			end
 		end
 	end
@@ -106,7 +106,7 @@ if $ARGS[0] = 'start':
 			gs 'willpower', 'bj', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -145,7 +145,7 @@ if $ARGS[0] = 'work_1':
 				'"Well, you know, the sight of your beautiful eyes nearly overwhelm me every time I see them. So does your tight ass." He says, smiling lecherously at you'
 				'You turn and give him a quick shake of your rump before departing.'
 
-				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Leave':gt 'pav_train_market', 'start'
 			end
 		end
 	end
@@ -189,7 +189,7 @@ if $ARGS[0] = 'work_2':
 					gs 'willpower', 'sex', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'pavtrain_market', 'start'
+					gt 'pav_train_market', 'start'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/arturkiosk.qsrc

@@ -30,7 +30,7 @@ act 'Kneel down':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		act 'Leave':gt 'pavtrain_market', 'start'
+		act 'Leave':gt 'pav_train_market', 'start'
 	end
 end
 

locations/carF.qsrc

@@ -15,7 +15,7 @@ $enddrive = {
 	if cardrive = 13:gt 'dachi'	
 	if cardrive = 14:gt 'liam'
 	if cardrive = 18:gt 'youplace'
-	if cardrive = 19:gt 'nordtrain', 'outside'
+	if cardrive = 19:gt 'city_industrial_train', 'outside'
 	if cardrive = 20:gt 'pav_residential'
 	if cardrive = 21:gt 'zaprF','start'
 	if cardrive = 22:gt 'road'

locations/city_center.qsrc

@@ -113,7 +113,7 @@ else
 	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 5 & gs ''cityTrain'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''city_train'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
 *nl
 if hour >= 8 and hour <= 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'

locations/city_industrial.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = '':
 		'The kiosk is closed between 23:00 and 07:00.'
 	end
 
-	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''nordtrain'', ''outside''">train station</a>.'
+	'At the center of the industrial region is a <a href="exec:minut += 15 & gt ''city_industrial_train'', ''outside''">train station</a>.'
 
 	if week = 3 or hour < 16:
 		'The Bar "Rabotnik" is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and 24:00.'

locations/nordtrain.qsrc → locations/city_industrial_train.qsrc

@@ -1,9 +1,9 @@
-# nordtrain
+# city_industrial_train
 
 if $ARGS[0] = 'inside':
 	$metka = 'inside'
-	$loc = 'nordtrain'
-	$menu_loc = 'nordtrain'
+	$loc = 'city_industrial_train'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -12,22 +12,22 @@ if $ARGS[0] = 'inside':
 	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalholle.jpg" ></center>'
-	'There is a <a href="exec:gt ''dort''">path</a> leading off in to the distance, in the direction of the lake.'
-	act 'Leave the station': minut += 2 & gt 'nordtrain', 'outside'
+	'There is a <a href="exec:gt ''city_lake_path''">path</a> leading off in to the distance, in the direction of the lake.'
+	act 'Leave the station': minut += 2 & gt 'city_industrial_train', 'outside'
 	*nl
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to the platforms': gt 'nordtrain', 'platform'
+		act 'Go to the platforms': gt 'city_industrial_train', 'platform'
 	else
-		act 'Go to the ticket office': minut += 1 & gt 'nordtrain', 'ticket'
+		act 'Go to the ticket office': minut += 1 & gt 'city_industrial_train', 'ticket'
 	end
-	act 'Go to the restrooms': minut += 1 & gt 'nordtrain', 'toilet'
+	act 'Go to the restrooms': minut += 1 & gt 'city_industrial_train', 'toilet'
 end
 
 if $ARGS[0] = 'outside':
 	$metka = 'outside'
-	$loc = 'nordtrain'
-	$menu_loc = 'nordtrain'
+	$loc = 'city_industrial_train'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'outside'
 	menu_off = 0
 	$location_type = 'public_outdoors'
@@ -48,13 +48,13 @@ if $ARGS[0] = 'outside':
 	end
 
 	act 'Go to the city industrial region': minut += 15 & gt'city_industrial'
-	act 'Enter the station building': minut += 2 & gt'nordtrain', 'inside'
+	act 'Enter the station building': minut += 2 & gt'city_industrial_train', 'inside'
 end
 
 if $ARGS[0] = 'platform':
 	$metka = 'platform'
-	$loc = 'nordtrain'
-	$menu_loc = 'nordtrain'
+	$loc = 'city_industrial_train'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'public_outdoors'
@@ -63,25 +63,25 @@ if $ARGS[0] = 'platform':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzalper.jpg" ></center>'
 	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying large bags. It feels like it is always busy here, no matter at what time of the day you are here.'
 
-	act 'Return to the station': minut += 5 & gt 'nordtrain', 'inside'
+	act 'Return to the station': minut += 5 & gt 'city_industrial_train', 'inside'
 	
 	if Trainpass_day > daystart:
-		act 'Take a train to the city center': gt 'nordtrain', 'centre'
+		act 'Take a train to the city center': gt 'city_industrial_train', 'centre'
 		
-		act 'Take a train to the old platform by the communal village': gt 'nordtrain', 'communal'
+		act 'Take a train to the old platform by the communal village': gt 'city_industrial_train', 'communal'
 		
-		act 'Take a train to the village of Gadukino': gt 'nordtrain', 'village'
+		act 'Take a train to the village of Gadukino': gt 'city_industrial_train', 'village'
 		
-		act 'Take a train to Pavlovsk': gt 'nordtrain', 'pavlovsk'
+		act 'Take a train to Pavlovsk': gt 'city_industrial_train', 'pavlovsk'
 	end
 end
 
 if $ARGS[0] = 'toilet':
 	$metkaM = 'toilet'
-	$locM = 'nordtrain'
+	$locM = 'city_industrial_train'
 	$metka = 'toilet'
-	$loc = 'nordtrain'
-	$menu_loc = 'nordtrain'
+	$loc = 'city_industrial_train'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'inside'
 	menu_off = 0
 	$location_type = 'bathroom'
@@ -93,7 +93,7 @@ if $ARGS[0] = 'toilet':
 
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 
-	act 'Return to the station': minut += 1 & gt 'nordtrain', 'inside'
+	act 'Return to the station': minut += 1 & gt 'city_industrial_train', 'inside'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -105,7 +105,7 @@ if $ARGS[0] = 'toilet':
 end
 
 if $ARGS[0] = 'ticket':
-	$menu_loc = 'nordtrain'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'ticket'
 	menu_off = 0
 	*clr & cla
@@ -113,12 +113,12 @@ if $ARGS[0] = 'ticket':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg"></center>'
 
-	act 'Leave the ticket office':minut += 1 & gt 'nordtrain', 'inside'
+	act 'Leave the ticket office':minut += 1 & gt 'city_industrial_train', 'inside'
 	
 	if money >= 50:
 		act 'Buy a ticket':
 			cla
-			gs 'nordtrain', 'buy_ticket'
+			gs 'city_industrial_train', 'buy_ticket'
 		end
 	end
 
@@ -127,7 +127,7 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'nordtrain', 'inside'
+			act 'Return': gt 'city_industrial_train', 'inside'
 		end
 	end
 
@@ -136,49 +136,49 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'nordtrain', 'inside'
+			act 'Return': gt 'city_industrial_train', 'inside'
 		end
 	end
 end
 
 if $ARGS[0] = 'buy_ticket':	
-	$menu_loc = 'nordtrain'
+	$menu_loc = 'city_industrial_train'
 	$menu_arg = 'buy_ticket'
 	menu_off = 0
 	
-	act 'Leave the ticket office': gt 'nordtrain', 'inside'
+	act 'Leave the ticket office': gt 'city_industrial_train', 'inside'
 	
 	if money >= 50:
 		act 'Buy a ticket to the city center (50 <b>₽</b>)':
 			money -= 50
-			gt 'nordtrain', 'centre'
+			gt 'city_industrial_train', 'centre'
 		end
 	end
 
 	if money >= 50:
 		act 'Buy a ticket to the old platform by the communal village (50 <b>₽</b>)':
 			money -= 100
-			gt 'nordtrain', 'communal'
+			gt 'city_industrial_train', 'communal'
 		end
 	end
 
 	if money >= 75:
 		act 'Buy a ticket to the village of Gadukino (75 <b>₽</b>)':
 			money -= 75
-			gt 'nordtrain', 'village'
+			gt 'city_industrial_train', 'village'
 		end
 	end
 
 	if money >= 125:
 		act 'Buy a ticket to Pavlovsk (125 <b>₽</b>)':
 			money -= 125
-			gt 'nordtrain', 'pavlovsk'
+			gt 'city_industrial_train', 'pavlovsk'
 		end
 	end
 end
 
 if $ARGS[0] = 'centre':
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$metka = 'inside'
 	menu_off = 1
 	*clr & cla
@@ -190,7 +190,7 @@ if $ARGS[0] = 'centre':
 
 	act 'Get off the train at this station':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'cityTrain', 'inside'
+		gt 'city_train', 'inside'
 	end
 end
 
@@ -226,7 +226,7 @@ if $ARGS[0] = 'village':
 end
 
 if $ARGS[0] = 'pavlovsk':
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'platform'
 	menu_off = 1
 	minut += 35
@@ -239,9 +239,9 @@ if $ARGS[0] = 'pavlovsk':
 	'After 35 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'
+		gt 'pav_train_hall', 'platform'
 	end
 end
 
---- nordtrain ---------------------------------
+--- city_industrial_train ---------------------------------
 

locations/city_lake.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
 	if $clothingworntype ! 'swimwear':
-		'There is a winding <a href="exec:gt ''dort'',''start''">path</a> leading to the railway station in the city industrial region.'
+		'There is a winding <a href="exec:gt ''city_lake_path'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
 	end

locations/dort.qsrc → locations/city_lake_path.qsrc

@@ -1,8 +1,8 @@
-# dort
+# city_lake_path
 
-$loc = 'dort'
+$loc = 'city_lake_path'
 $metka = ''
-$menu_loc = 'dort'
+$menu_loc = 'city_lake_path'
 $menu_arg = ''
 menu_off = 0
 
@@ -16,8 +16,8 @@ gs'stat'
 
 !'<a href="exec:gt ''nowostreet'',''start''">Buildings</a> '
 
-act 'Head to the station':gt 'nordtrain', 'inside'
+act 'Head to the station':gt 'city_industrial_train', 'inside'
 act 'Walk to the lake':gt 'city_lake', 'start'
 
---- dort ---------------------------------
+--- city_lake_path ---------------------------------
 

locations/cityTrain.qsrc → locations/city_train.qsrc

@@ -1,10 +1,10 @@
-# cityTrain
+# city_train
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
@@ -22,14 +22,14 @@ if $ARGS[0] = 'start':
 	end
 
 	act 'Go to the city center':minut += 5 & gt 'city_center'
-	act 'Enter the station building': minut += 1 & gt 'cityTrain', 'inside'
+	act 'Enter the station building': minut += 1 & gt 'city_train', 'inside'
 end
 
 if $ARGS[0] = 'inside':
 	$metka = 'inside'
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$location_type = 'public_indoors'
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'inside'
 	menu_off = 0
 	*clr & cla
@@ -38,17 +38,17 @@ if $ARGS[0] = 'inside':
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
 	'The grand old station is even more impressive on the inside and has a number of shops and bars as well as all the platforms and trains. '
 	*nl
-	act 'Leave the train station': minut += 1 & gt 'cityTrain', 'start'
+	act 'Leave the train station': minut += 1 & gt 'city_train', 'start'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to the platforms': gt 'cityTrain', 'platform'
+		act 'Go to the platforms': gt 'city_train', 'platform'
 	else
-		act 'Go to the ticket office': gt 'cityTrain', 'tickets'
+		act 'Go to the ticket office': gt 'city_train', 'tickets'
 	end
 end
 
 if $ARGS[0] = 'tickets':
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'tickets'
 	menu_off = 0
 	*clr & cla
@@ -56,11 +56,11 @@ if $ARGS[0] = 'tickets':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg" ></center>'
 
-	act 'Leave the ticket office':minut += 1 & gt 'cityTrain', 'inside'
+	act 'Leave the ticket office':minut += 1 & gt 'city_train', 'inside'
 	
 	act 'Buy a ticket':
 		cla
-		gs 'cityTrain', 'buy_ticket'
+		gs 'city_train', 'buy_ticket'
 	end
 
 	if money >= 1500 and Trainpass_day <= daystart:
@@ -69,7 +69,7 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'cityTrain', 'inside'
+			act 'Return': gt 'city_train', 'inside'
 		end
 	end
 
@@ -79,22 +79,22 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'cityTrain', 'inside'
+			act 'Return': gt 'city_train', 'inside'
 		end
 	end	
 end
 
 if $ARGS[0] = 'buy_ticket':
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'buy_ticket'
 	menu_off = 0
 	
-	act 'Leave the ticket office': minut += 1 & gt 'cityTrain', 'inside'
+	act 'Leave the ticket office': minut += 1 & gt 'city_train', 'inside'
 	
 	act 'Buy a ticket to the city industrial area (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
-			gt 'cityTrain', 'ind'
+			gt 'city_train', 'ind'
 		else
 			'You don''t have enough money for this ticket.'
 		end
@@ -103,7 +103,7 @@ if $ARGS[0] = 'buy_ticket':
 	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
-			gt 'cityTrain', 'communal'
+			gt 'city_train', 'communal'
 		else
 			'You don''t have enough money for this ticket.'
 		end	
@@ -112,7 +112,7 @@ if $ARGS[0] = 'buy_ticket':
 	act 'Buy a ticket to the village of Gadukino (100 <b>₽</b>)':
 		if money >= 100:
 			money -= 100
-			gt 'cityTrain', 'village'
+			gt 'city_train', 'village'
 		else
 			'You don''t have enough money for this ticket.'	
 		end
@@ -121,7 +121,7 @@ if $ARGS[0] = 'buy_ticket':
 	act 'Buy a ticket to Pavlovsk (150 <b>₽</b>)':
 		if money >= 150:
 			money -= 150
-			gt 'cityTrain', 'pavlovsk'
+			gt 'city_train', 'pavlovsk'
 		else
 			'You don''t have enough money for this ticket.'		
 		end
@@ -130,26 +130,26 @@ end
 
 if $ARGS[0] = 'platform':
 	$location_type = 'public_outdoors'
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'platform'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzalper.jpg" ></center>'
 	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying shopping bags. It feels like it is always busy here, no matter at what time of the day it is.'
 
-	act 'Return to the station hall':gt 'cityTrain', 'inside'
+	act 'Return to the station hall':gt 'city_train', 'inside'
 	
-	act 'Take a train to the city industrial area': gt 'cityTrain', 'ind'
+	act 'Take a train to the city industrial area': gt 'city_train', 'ind'
 
-	act 'Take a train to the old platform by the communal village': gt 'cityTrain', 'communal'
+	act 'Take a train to the old platform by the communal village': gt 'city_train', 'communal'
 
-	act 'Take a train to the village of Gadukino': gt 'cityTrain', 'village'
+	act 'Take a train to the village of Gadukino': gt 'city_train', 'village'
 
-	act 'Take a train to Pavlovsk': gt 'cityTrain', 'pavlovsk'
+	act 'Take a train to Pavlovsk': gt 'city_train', 'pavlovsk'
 end
 
 if $ARGS[0] = 'ind':
-	$loc = 'nordtrain'
+	$loc = 'city_industrial_train'
 	$metka = 'platform'
 	menu_off = 1
 	minut += 5
@@ -161,7 +161,7 @@ if $ARGS[0] = 'ind':
 	'After 5 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'
+		gt 'city_industrial_train', 'platform'
 	end
 end
 
@@ -198,7 +198,7 @@ if $ARGS[0] = 'village':
 end
 
 if $ARGS[0] = 'pavlovsk':
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'platform'
 	menu_off = 1
 	minut += 40
@@ -212,9 +212,9 @@ if $ARGS[0] = 'pavlovsk':
 	'After 40 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'
+		gt 'pav_train_hall', 'platform'
 	end
 end
 
---- cityTrain ---------------------------------
+--- city_train ---------------------------------
 

locations/dimaRevenge.qsrc

@@ -1008,7 +1008,7 @@ if dimaRevChoice = 5:
 								'You wonder how he got this video in the first place and about the other videos. You check them and find several with names of girls you know. Then you see one with your name. You open it and find a video with clips of you in the locker room and shower.'
 								'"You fucking pig!!" you scream as you punch and kick Petia until he can''t take anymore and passes out. You check his pockets and find a wallet with 1000 roubles.
 								You pocket the money and throw his phone and wallet into a nearby pond, then head to the train station and finally home. You don''t know how Petia is going to get back, and you don''t care. Today was an ordeal and you just want to rest.'
-								act 'Continue': minut += 45 & gt 'pavtrain'
+								act 'Continue': minut += 45 & gt 'pav_train'
 							end
 						end
 					end

locations/etoexhib.qsrc

@@ -1696,7 +1696,7 @@ if $ARGS[0] = 'pos54':
 		end
 	end
 
-	act 'Leave': gt 'nordtrain', 'outside'
+	act 'Leave': gt 'city_industrial_train', 'outside'
 
 	if age < 18 and fakepassport ! 1:
 		if money => 30000:
@@ -1709,7 +1709,7 @@ if $ARGS[0] = 'pos54':
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 				'You bought a fake passport, which claims you are an adult.'
 
-				act 'Leave': gt 'nordtrain', 'outside'
+				act 'Leave': gt 'city_industrial_train', 'outside'
 			end
 		else
 			act 'Buy fake passport (<font color="red">30,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake passport.</font>'
@@ -1727,7 +1727,7 @@ if $ARGS[0] = 'pos54':
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 				'You bought a fake diploma.'
 
-				act 'Leave': gt 'nordtrain', 'outside'
+				act 'Leave': gt 'city_industrial_train', 'outside'
 			end
 		else
 			act 'Buy fake diploma (<font color="red">100,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake diploma.</font>'

locations/events.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'snkayf':
 
 	if snkz = 5:
 		minut += 120
-		gt 'pavtrainhall', 'female'
+		gt 'pav_train_hall', 'female'
 	end
 
 	if snkz = 6:
@@ -278,7 +278,7 @@ if $ARGS[0] = 'snarkozaka':
 	'Amphetamine: 600 <b>₽</b>'
 	'Weed: 300 <b>₽</b>'
 	
-	act 'Leave': gt 'pavtrainhall'
+	act 'Leave': gt 'pav_train_hall'
 	
 	if money >= 560:
 		act 'Buy and use heroin (560 <b>₽</b>)':

locations/family.qsrc

@@ -137,7 +137,7 @@ if StoryLine = 1:
 			!! for future code I guess
 		end
 
-		if $loc = 'pavtrain':
+		if $loc = 'pav_train':
 			!! for future code I guess
 		end
 

locations/gdksex.qsrc

@@ -837,7 +837,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pavtrain'
+								gt 'pav_train'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -867,7 +867,7 @@ if $ARGS[0] = 'heating_up':
 						gs 'willpower', 'exhib', 'resist', 'easy'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pavtrain'
+						gt 'pav_train'
 					end
 				else
 					act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -888,7 +888,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pavtrain'
+								gt 'pav_train'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -937,7 +937,7 @@ if $ARGS[0] = 'heating_up':
 									gs 'willpower', 'prostitution', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pavtrain'
+									gt 'pav_train'
 								end
 							else
 								act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'End':
 	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'When you look around the room, you find a packet of sanitary napkins. You take one and quickly wipe the sperm off your face, in an attempt to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the hotel': gt 'pavtrain'
+	act 'Leave the hotel': gt 'pav_train'
 end
 
 if $ARGS[0] = 'drug_user':
@@ -1565,7 +1565,7 @@ if $ARGS[0] = 'drugs':
 								gs 'arousal', 'end'
 								pcs_horny += 100
 								gs 'stat'
-								act 'Leave the room': gt 'pavtrain'
+								act 'Leave the room': gt 'pav_train'
 							end
 						end
 					end
@@ -1586,7 +1586,7 @@ if $ARGS[0] = 'drugs':
 			'You try to excuse yourself saying this was all a mistake and that it wasn''t your intention to lead him on...'
 			'<<$boydesc>> stops for a moment and you notice that he''s clearly affected by the drugs. His eyes flare up as he leaps from the chair, shouting that you''re only a simple country whore that only was after his drugs.'
 			'He grabs a hold of you and shoves you over to the door, throwing you outside. You stand there in shock as the drugs grab hold of you and you feel yourself aroused and getting an urge to have sex. You knock on the door but <<$boydesc>> refuses to open. You decide to head out... maybe you''ll get lucky somewhere else.'
-			act 'Leave the hotel': gt 'pavtrain'
+			act 'Leave the hotel': gt 'pav_train'
 		end
 	else
 		act 'Shake your head (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1599,7 +1599,7 @@ if $ARGS[0] = 'no drugs':
 	'"You''re not fooling me, there is no way I''m doing that. Who knows what that powder is, I don''t want to get raped. Have fun by yourself, loser."'
 	'<<$boydesc>> snorts deeply and looks over to you, "Too bad, you''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine. It was good meeting you..." you say as you leave the room. <<$boydesc>> just shrugs his shoulders and jumps straight back into what he started.'
-	act 'Leave the room': gt 'pavtrain'
+	act 'Leave the room': gt 'pav_train'
 end
 
 --- gdksex ---------------------------------

locations/gkafe.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 	'A small cafe, attached to the train station. It looks rather shabby.'
 	'The cafe is closed right now, it''s usually open between 8:00 and 20:00.'
 
-	act 'Leave the cafe':gt 'pavtrain'
+	act 'Leave the cafe':gt 'pav_train'
 
 	if mother_go = 1 and hour = 16 and indorf = 0:
 		*clr & cla
@@ -55,13 +55,13 @@ if $ARGS[0] = '':
 					*nl
 					'The cafe owner abruptly pulls his groin away from your mother''s mouth, a string of saliva still attached to his dick as he roughly pulls your mother up by her shoulders and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing in following up his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately drove his cock in her pussy. His thrusting is fast and furious and you figure he doesn''t intend to stay here much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as she is getting her pussy roughly pounded by her boss, you can easily hear it despite the window between you and them. And sure enough, a few moments later he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees quickly without needing a prompt and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates, before she sees you.'
 
-					act 'Leave the cafe':gt 'pavtrain'
+					act 'Leave the cafe':gt 'pav_train'
 				end
-				act 'Leave, you don''t want to see this':gt 'pavtrain'
+				act 'Leave, you don''t want to see this':gt 'pav_train'
 			end
-			act 'Leave, it''s none of your business':gt 'pavtrain'
+			act 'Leave, it''s none of your business':gt 'pav_train'
 		end
-		act 'Leave, it''s none of your business':gt 'pavtrain'
+		act 'Leave, it''s none of your business':gt 'pav_train'
 	else
 		if hour >= 8 and hour <= 19:
 			*clr & cla
@@ -69,7 +69,7 @@ if $ARGS[0] = '':
 			*nl
 			'A small cafe, attached to the train station. It looks rather shabby.'
 
-			act 'Leave the cafe':gt 'pavtrain'
+			act 'Leave the cafe':gt 'pav_train'
 			
 			gs 'gkafe', 'menu'
 

locations/gopskver.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = '':
 	gs 'dinsexFX'
 	if $prevloc = 'gkafe':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
-	elseif $prevloc = 'pavtrainhall':
+	elseif $prevloc = 'pav_train_hall':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
@@ -24,7 +24,7 @@ if $ARGS[0] = '':
 		if hour < 20:
 			if $prevloc = 'gkafe':
 				'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
-			elseif $prevloc = 'pavtrainhall':
+			elseif $prevloc = 'pav_train_hall':
 				'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and offers you to join them.'
 			else
 				'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends in the park, and offers you to join them.'
@@ -249,7 +249,7 @@ if $ARGS[0] = '':
 					iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
 
 					act 'Decline the beer and leave':
-						if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+						if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 							gt $prevloc
 						else
 							gt 'gskver', 'start'
@@ -265,7 +265,7 @@ if $ARGS[0] = '':
 						'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 
 						act 'Continue':
-							if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+							if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 								gt $prevloc
 							else
 								gt 'gskver', 'start'
@@ -294,7 +294,7 @@ if $ARGS[0] = '':
 							'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
 							act 'Continue':
-								if $prevloc = 'gkafe' or $prevloc = 'pavtrainhall':
+								if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
 									gt $prevloc
 								else
 									gt 'gskver', 'start'
@@ -304,7 +304,7 @@ if $ARGS[0] = '':
 					elseif pav_slut < 150:
 						if $prevloc = 'gkafe':
 							'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
-						elseif $prevloc = 'pavtrainhall':
+						elseif $prevloc = 'pav_train_hall':
 							'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
 						end
 						'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
@@ -425,7 +425,7 @@ if $ARGS[0] = '':
 
 				if $prevloc = 'gkafe':
 					act 'Blush and quickly leave the cafe': gt $prevloc
-				elseif $prevloc = 'pavtrainhall':
+				elseif $prevloc = 'pav_train_hall':
 					act 'Blush and quickly leave the train station': gt $prevloc
 				else
 					act 'Blush and keep walking':gt 'gskver', 'start'

locations/gschool_socialchg1.qsrc

@@ -725,7 +725,7 @@ if $ARGS[0] = 'tBella':
 		'"Hanging around older people does have its perks," she winks. "One of my friends can get me in, no questions asked."'
 		'You nod your head, "Must be great hanging around older people..."'
 		'"Oh, the stories I''ve got to tell..." Bella replies but before she can continue on there''s an announcement and she excuses herself saying that''s the train she needs to catch.'
-		act 'Return to the train station': gt 'pavtrainhall'
+		act 'Return to the train station': gt 'pav_train_hall'
 	end
 	
 	act 'What''s wrong with the gym in Pavlovsk?':
@@ -738,7 +738,7 @@ if $ARGS[0] = 'tBella':
 		'"Like what?" you continue on pressing.'
 		'Bella gives you a smirk, "Well first of all, there will be fully grown men there not only little wimpy boys that think they''re the shit. Real men that know how to treat women... And let''s not talk about all the sexy women that work out."'
 		'As she''s about to continue on you hear an announcement about a train, "That''s my train I need to catch, too bad <<$pcs_nickname>> I though of inviting you but you disappointed me. I had higher hopes about you..." she says as she''s walking away from you.'
-		act 'Return to the train station': gt 'pavtrainhall'
+		act 'Return to the train station': gt 'pav_train_hall'
 	end
 end
 

locations/hotel_resep.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'pavlbarcont':
 			fingal = 1
 			gs 'stat'
 
-			act'Run away':gt'pavtrain'
+			act'Run away':gt'pav_train'
 		end
 	end
 	exit

locations/katalkin.qsrc

@@ -45,7 +45,7 @@ if hour >= 8 and hour < 22:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 					'You agree to pay the fine, and put the money on his desk after counting it. He swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+					act 'Leave the police station':minut += 1 & gt 'pav_train_hall'
 				end
 			else
 				act 'You can''t pay the fine':
@@ -82,7 +82,7 @@ if hour >= 8 and hour < 22:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 						'You tell him you will pay the fine after all, and put the money on his desk after counting it. He disappointedly swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-						act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+						act 'Leave the police station':minut += 1 & gt 'pav_train_hall'
 					end
 				else
 					act 'Spend the night in jail':
@@ -144,7 +144,7 @@ if hour >= 8 and hour < 22:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 						'You see a tinge of regret in his face when you give him the money. "Oh. Very well then, miss <<$pcs_lastname>>. You''re free to go."'
 
-						act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+						act 'Leave the police station':minut += 1 & gt 'pav_train_hall'
 					end
 				else
 					act 'Give him the money (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -259,7 +259,7 @@ elseif hour >= 22:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 					'You agree to pay the fine, and put the money on his desk after counting it. He swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
+					act 'Leave the police station':minut += 1 & gt 'pav_train_hall'
 				end
 			else
 				act 'You can''t pay the fine':
@@ -292,7 +292,7 @@ elseif hour >= 22:
 	end
 end
 
-if katalkinNoexit = 0:act 'Leave his office': minut += 1 & gt 'pavstation', 'station_inside'
+if katalkinNoexit = 0:act 'Leave his office': minut += 1 & gt 'pav_station', 'station_inside'
 
 --- katalkin ---------------------------------
 

locations/katalkinAlko.qsrc

@@ -4,7 +4,7 @@ gs 'stat'
 if hour < 8:
 	'After their drinking session, the policemen finally fell asleep right in the middle of the police station.'
 
-	act 'Quietly get up and leave':minut += 1 & gt 'pavtrainhall'
+	act 'Quietly get up and leave':minut += 1 & gt 'pav_train_hall'
 
 	exit
 end
@@ -30,7 +30,7 @@ end
 !!end
 
 
-act 'Leave the police station':minut += 2 & gt 'pavtrainhall'
+act 'Leave the police station':minut += 2 & gt 'pav_train_hall'
 
 --- katalkinAlko ---------------------------------
 

locations/korr.qsrc

@@ -179,7 +179,7 @@ if BurgerQW['IvanQW']  = 3 and hour >= 9 and hour <= 20:
 
 			'Time draggs on slowly. Your life and work are tedious and monotonous. You''ve been sewing for five years, having meals in the dining room and going to sleep in the barracks surrounded by other women inmates. With your salary of 2,000 <b>₽</b> per month 1000 of which going on debt repayment. But for as slow as it seems, time does not stand still and finally your torment comes to an end. You are released and given 2,000 <b>₽</b>. You take the train and came back to the city.'
 
-			act 'Get off the train': gt 'nordtrain', 'outside'
+			act 'Get off the train': gt 'city_industrial_train', 'outside'
 		end
 	end
 	exit

locations/korr2x.qsrc

@@ -146,7 +146,7 @@ if BurgerQW['IvanQW']  = 3 and hour >= 9 and hour <= 20:
 			lektor = 0
 			gs'stat'
 			'Time dragged on for a long time. Your life and work in prison was tedious and monotonous. You sewed quilted jackets, had dinner in the cafeteria and went to sleep in the barracks surrounded by other women inmates. With your salary 2000 <b>₽</b> a month listed 1000 debt repayment. Eventually you payed off your debt and your torment came to an end. With your time served you were released with 2000 <b>₽</b>. You were taken to the train station and given a ticket back to the city.'
-			act 'Exit the train': gt 'nordtrain', 'outside'
+			act 'Exit the train': gt 'city_industrial_train', 'outside'
 		end
 	end
 	exit

locations/kutuzka.qsrc

@@ -16,7 +16,7 @@ if kutime > 0:
 elseif kutime <= 0:
 	'You have finally spent enough time in the prison cell, and captain Katalkin comes to let you out.'
 
-	act 'Continue':minut += 1 & gt 'pavtrainhall'
+	act 'Continue':minut += 1 & gt 'pav_train_hall'
 end
 
 --- kutuzka ---------------------------------

locations/liam.qsrc

@@ -64,7 +64,7 @@ end
 
 if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marina''s Apartment</a>'
 
-act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pavTrain'
+act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pav_train'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'gskver', 'start'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 

locations/olutaxi.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'station':
 			'You nod to them. "Ok well good luck, I will let you get back to work and nice meeting you Djibril."'
 			'You get up and he says. "Thank you and you have a good day as well."'
 			'While Djibril says. "It was nice meeting you as well." With that you walk away and let Olu get back to work.'
-			act 'Leave': gt'pavtrainhall'
+			act 'Leave': gt'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
@@ -83,13 +83,13 @@ if $ARGS[0] = 'station':
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big55.jpg"></center>'
 					'You shake your head no. "Maybe some other time."'
 					'Olu nods and smiles. "Ok." Then they go back to just talking to you about a variety of topics, but Olu also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi. Djibril tells you bye as well and follows his uncle and the man outside.'
-					act 'Leave': gt'pavtrainhall'
+					act 'Leave': gt'pav_train_hall'
 				end
 			else
 				'You ask. "Mind if i sit and talk with you guys for awhile?"'
 				'Olu scoot over to make room for you. "No of course not."'
 				'You take a seat and soon the three of you are talking. They ask you about school, Djibril talks about the University and living in the city. They talk about some of the funny or odd things to them at least they have seen since living in Russia and you tell them about a variety of things. All and all you have a good conversation with them. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and Djibril tell you buy. Djibril helps the people with some luggage, you guess they are tourist, while Olu rushes out to go pull the taxi around. They both wave bye to you as they depart.'
-				act 'Leave': gt'pavtrainhall'
+				act 'Leave': gt'pav_train_hall'
 			end
 		end
 	else
@@ -100,7 +100,7 @@ if $ARGS[0] = 'station':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big55.jpg"></center>'
 			'You nod to him. "Ok well good luck, I will let you get back to work." You get up and he says. "Thank you and you have a good day as well." With that you walk away and let him get back to work.'
-			act 'Leave': gt'pavtrainhall'
+			act 'Leave': gt'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
@@ -153,13 +153,13 @@ if $ARGS[0] = 'station':
 					'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big55.jpg"></center>'
 					'You shake your head no. "Maybe some other time."'
 					'He nods and smiles. "Ok." Then he goes back to just talking to you about a variety of topics, but he also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi.'
-					act 'Leave': gt'pavtrainhall'
+					act 'Leave': gt'pav_train_hall'
 				end
 			else
 				'You ask. "Mind if I sit and talk with you, for awhile?"'
 				'Olu scoots over to make room for you. "No of course not."'
 				'You take a seat and soon the two of you are talking. He asks you about school and boys you like. He tells you about some of the funny or odd things to him at least he has seen since living in Russia and you tell him about a variety of things. All and all you have a good conversation with him. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and helps them with there luggage, they are tourist if you had to guess. He waves bye to you as he helps them carry their luggage outside.'
-				act 'Leave': gt'pavtrainhall'
+				act 'Leave': gt'pav_train_hall'
 			end
 		end
 	end
@@ -186,7 +186,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			'You pull away from him, but he follows you still kissing you while one hand cups one of your breasts. You put both your hands against his chest and push him hard enough he pulls back. He looks at you looking confused, he obviously thought this is what you wanted. "Sorry I thought this is what you wanted."'
 			'You shake your head no. "No I just wanted to talk is all, get to know you. Maybe some other time."'
 			'He nods but seems to have lost a lot of interest, the two of you talk for a bit but he seems a bit distracted. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
-			act 'Leave':minut += 3 & gt 'pavtrain'
+			act 'Leave':minut += 3 & gt 'pav_train'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -213,7 +213,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 				'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. The two of you talk for a bit but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pavtrain'
+				act 'Leave':minut += 3 & gt 'pav_train'
 			end
 		else
 			act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 					'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. Once you are dressed you open the door and climb out. "Sorry." You tell him as you get out and walk away. He gets out behind and closes the door as you walk away.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pavtrain'
+					act 'Leave':minut += 3 & gt 'pav_train'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -373,7 +373,7 @@ if $ARGS[0] = 'djibril_taxi_sex_anal1':
 		gs 'cum_call', 'butt', 'A82'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pavtrain'
+		act 'Leave':minut += 3 & gt 'pav_train''
 	end
 end
 	
@@ -400,7 +400,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 		'You nod to him. "Sure maybe another day." Then you walk off.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pavtrain'
+		act 'Leave':minut += 3 & gt 'pav_train''
 	end
 	act 'Blow him':
 		*clr & cla
@@ -443,7 +443,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 						gs 'cum_call', 'mouth', 'A55'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':minut += 3 & gt 'pavtrain'
+						act 'Leave':minut += 3 & gt 'pav_train'
 					end
 				end
 			else
@@ -486,7 +486,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 							gs 'cum_call', 'mouth', 'A55'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':minut += 3 & gt 'pavtrain'
+							act 'Leave':minut += 3 & gt 'pav_train'
 						end
 					end
 				else
@@ -552,7 +552,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pavtrain'
+					act 'Leave':minut += 3 & gt 'pav_train'
 				end
 			end
 		end
@@ -580,7 +580,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pavtrain'
+					act 'Leave':minut += 3 & gt 'pav_train'
 				end
 			end
 		else
@@ -642,7 +642,7 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pavtrain'
+					act 'Leave':minut += 3 & gt 'pav_train'
 				end
 			end
 		end

locations/pav_commercial.qsrc

@@ -95,7 +95,7 @@ else
 	$Pharmname = 'For easy access, there''s even a pharmacy attached to it but it''s currently closed for the day.'
 end
 
-'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pavtrain''">train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
+'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_train''">train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
 
 if week < 6 and hour >= 9 and hour <= 18:
 	$desc_txt4 = '<a href="exec:minut += 3 & gt ''postoffice'', ''start''">post office</a>'
@@ -144,7 +144,7 @@ if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
-act 'Walk to the train station (0:10)':minut += 10 & gt 'pavtrain'
+act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'

locations/pav_shared_apt.qsrc

@@ -1,4 +1,4 @@
-# pavSharedApt
+# pav_shared_apt
 
 gs 'themes', 'indoors'
 close all
@@ -162,7 +162,7 @@ end
 
 ! accomodation advert
 if $ARGS[0] = 'advertNo30':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'advertNo30'
 	menu_off = 1
 	minut += 2
@@ -176,36 +176,36 @@ end
 ! door No 3 - shared
 if $ARGS[0] = 'doorNo30':
 	CLOSE ALL
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'doorNo30'
 	menu_off = 1
-	act 'Go back outside':gt 'pavComplex', 'start'
+	act 'Go back outside':gt 'pav_complex', 'start'
 	if pavSharedAptEnabled = 1:
 		'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
 		'<br>You stand before the entry door to apartment No 30. The apartment you share with three others'
-		act 'Go inside':gt 'pavSharedApt', 'start'
+		act 'Go inside':gt 'pav_shared_apt', 'start'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/sharedapt/aptno3door.jpg"></center>'
 		'<br>You stand before the entry door to apartment No 30. There is a sign on the door saying - "сдаeтся в аренду комната" (Room for rent).'
-		act 'Knock on the door':gt 'pavSharedApt', 'intro'
+		act 'Knock on the door':gt 'pav_shared_apt', 'intro'
 	end
 	
 end
 
 ! apt hall
 if $ARGS[0] = 'start':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'start'
 	menu_off = 0
-	$locM = 'pavSharedApt'
+	$locM = 'pav_shared_apt'
 	$metkaM = 'start'
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'start'
 	$goBack = $metka
 	$location_type = 'private'
 	killvar '$locclass'
-	gs 'pavSharedApt', 'update'
-	if introDone = 0:gt 'pavSharedApt', 'intro'
+	gs 'pav_shared_apt', 'update'
+	if introDone = 0:gt 'pav_shared_apt', 'intro'
 	minut += 2
 	gs 'stat'
 	
@@ -242,9 +242,9 @@ if $ARGS[0] = 'start':
 		if rentLeft > 0:
 			'You have left <<rentLeft>> <b>₽</b> of rent to pay for the next week.'
 			if servitudeLvl >= 1:
-				'You may still pay it in <a href="exec:gt ''pavSharedApt'', ''payCash''">cash</a>, if you want.'
+				'You may still pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, if you want.'
 			else
-				'Pay it in <a href="exec:gt ''pavSharedApt'', ''payCash''">cash</a>.'
+				'Pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>.'
 			end
 		else
 			'You have already paid the whole rent for the next week.'
@@ -260,7 +260,7 @@ if $ARGS[0] = 'start':
 			'You did not pay the whole rent for this week. You still have to pay <<rentLeft>> <b>₽</b>.'
 			if money >= rentLeft:
 				!not enough cash to pay it manually
-				'You still can pay it in <a href="exec:gt ''pavSharedApt'', ''payCash''">cash</a>, otwerwise you''ll be kicked out!'
+				'You still can pay it in <a href="exec:gt ''pav_shared_apt'', ''payCash''">cash</a>, otwerwise you''ll be kicked out!'
 			else
 				!in future add some way to serve your way out
 				'You do not have enough money to pay the rest of the rent in cash, even if you wanted to. Guess you''ll have to find a new living place...'
@@ -272,10 +272,10 @@ if $ARGS[0] = 'start':
 
 	act '<b>Leave and go outside</b>':
 		if $clothingworntype ! 'nude':
-			gt 'pavComplex', 'start'
+			gt 'pav_complex', 'start'
 		else
 			msg'<b><font color = red>You need to get dressed.</font></b>'
-			gt 'pavSharedApt', 'start'
+			gt 'pav_shared_apt', 'start'
 		end
 	end
 	
@@ -287,20 +287,20 @@ if $ARGS[0] = 'start':
 		'A large apartment currently serves as shared living. As well as the normal living spaces, there are four bedrooms, one rented by you and three occupied by <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>.'
 		'You stand in the hallway. '
 		*nl
-		'From the hallway several doors lead to <a href="exec:gt ''pavSharedApt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pavSharedApt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pavSharedApt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
-		'The last doors lead to the <a href="exec:gt ''pavSharedApt'', ''pcsRoom''">room</a> you have rented.'
+		'From the hallway several doors lead to <a href="exec:gt ''pav_shared_apt'', ''ndRoom''"><<$nd_name>>''s</a>, <a href="exec:gt ''pav_shared_apt'', ''gpRoom''"><<$gp_name>>''s</a> and <a href="exec:gt ''pav_shared_apt'', ''spRoom''"><<$sp_name>>''s</a> rooms.'
+		'The last doors lead to the <a href="exec:gt ''pav_shared_apt'', ''pcsRoom''">room</a> you have rented.'
 		*nl
 		!! Wardrobe is here, because Sveta''s bedroom is actually the unused living room, with no wardrobe, so she is using the hall cupboard.
 		'There are no cupboards in your livingroom cum bedroom, but there are several hall <a href="exec:gt ''wardrobe'', ''start''">closets</a>, that you can use to store your clothes</a>, with a large tall <a href="exec:gt ''mirror'', ''start''">mirror</a> attached.'
 		*nl
-		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pavSharedApt'', ''list''">list</a> hangs on the exit door.' & *nl
+		if servitudeLvl >= 1:'A computer printed <a href="exec:gt ''pav_shared_apt'', ''list''">list</a> hangs on the exit door.' & *nl
 		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
-		act 'Go to your room':gt 'pavSharedApt', 'pcsRoom'
-		act 'Go to the bathroom':gt 'pavSharedApt', 'bathroom'
-		act 'Go to the kitchen':gt 'pavSharedApt', 'kitchen'
-		act '<font color=#<<$nd_font>>><<$nd_name>>''s room</font>':gt 'pavSharedApt', 'ndRoom'
-		act '<font color=#<<$gp_font>>><<$gp_name>>''s room</font>':gt 'pavSharedApt', 'gpRoom'
-		act '<font color=#<<$sp_font>>><<$sp_name>>''s room</font>':gt 'pavSharedApt', 'spRoom'
+		act 'Go to your room':gt 'pav_shared_apt', 'pcsRoom'
+		act 'Go to the bathroom':gt 'pav_shared_apt', 'bathroom'
+		act 'Go to the kitchen':gt 'pav_shared_apt', 'kitchen'
+		act '<font color=#<<$nd_font>>><<$nd_name>>''s room</font>':gt 'pav_shared_apt', 'ndRoom'
+		act '<font color=#<<$gp_font>>><<$gp_name>>''s room</font>':gt 'pav_shared_apt', 'gpRoom'
+		act '<font color=#<<$sp_font>>><<$sp_name>>''s room</font>':gt 'pav_shared_apt', 'spRoom'
 	end
 
 	if home_owned[2] = 0 and kid > 0:
@@ -312,7 +312,7 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/revenge/crying.jpg"></center>'
 		'You''ve been kicked out of the apartment due to having children.'
 		pavSharedAptEnabled = 0
-		act 'Leave':gt 'pavComplex', 'start'
+		act 'Leave':gt 'pav_complex', 'start'
 	end
 end
 
@@ -329,7 +329,7 @@ if $ARGS[0] = 'payCash':
 	else
 		'You do not have enough money to pay it.'
 	end
-	act 'Proceed':gt 'pavSharedApt', 'start'
+	act 'Proceed':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'payService':
@@ -337,7 +337,7 @@ if $ARGS[0] = 'payService':
 	minut += 1
 	'The amount '+price+' <b>₽</b> was taken in account of your weekly rent.'
 	servicePaid += price
-	act 'Continue':gt 'pavSharedApt', 'start'
+	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'rentSetup':
@@ -347,12 +347,12 @@ if $ARGS[0] = 'rentSetup':
 	rentPaid = 1
 	introDone = 1
 	rentWeekNum = (daystart - (daystart mod 7)) / 7 + 1
-	act 'Continue':gt 'pavSharedApt', 'start'
+	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'intro':
 	menu_off = 1
-	gs 'pavSharedApt', 'update'
+	gs 'pav_shared_apt', 'update'
 	if step > 0:
 		'<center><img border="5" bordercolor="<<$sp_font>>" height="150" src="images/locations/pavlovsk/resident/sharedapt/sp/sp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/gp/gp.jpg"> <img height="150" src="images/locations/pavlovsk/resident/sharedapt/nd/nd.jpg"></center>'
 		''
@@ -367,7 +367,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$sp_font>>>"Hi sweetie! What do you need?"</font>'
 		'<font color=#<<$pcs_font>>>"Hello, my name is <<$pcs_firstname>> <<$pcs_lastname>>. I''ve seen the advert that someone here have a spare room for rent?"</font>'
 		'<font color=#<<$sp_font>>>"Yeah, that''s true. Come in, I''ll call the guys and we can talk about it. I''m <<$sp_name>> by the way."</font>'
-		act 'Go in':gt 'pavSharedApt', 'intro'
+		act 'Go in':gt 'pav_shared_apt', 'intro'
 	elseif pavIntroStep = 1:
 		minut += 3
 		pavIntroStep = 2
@@ -397,17 +397,17 @@ if $ARGS[0] = 'intro':
 				cla
 				pavIntroStep = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell you, I''m currently pregnant. How you feel about having children in the apartment, will this be a problem?"</font>'
-				act 'continue':gt 'pavSharedApt', 'intro'
+				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		elseif kid > 0:
 			act 'Ask about children':
 				cla
 				pavIntroStep = 50
 				'<font color=#<<$pcs_font>>>"I thought I should tell, I''m mother. How you feel about having children in the apartment, will this be a problem?"</font>'
-				act 'continue':gt 'pavSharedApt', 'intro'
+				act 'continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
-			act 'Continue':gt 'pavSharedApt', 'intro'
+			act 'Continue':gt 'pav_shared_apt', 'intro'
 		end
 	elseif pavIntroStep = 2:
 		minut += 3
@@ -426,7 +426,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$sp_font>>>"Yes, exactly."</font>'
 		'<font color=#<<$gp_font>>>"And more."</font>'
 		'<font color=#<<$nd_font>>>"Oh my... I give up."</font>'
-		act 'More what?':gt 'pavSharedApt', 'intro'
+		act 'More what?':gt 'pav_shared_apt', 'intro'
 	elseif pavIntroStep = 3:
 		minut += 3
 		'<font color=#<<$gp_font>>>"More services."</font>'
@@ -436,10 +436,10 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$nd_font>>>"Please <<$pcs_firstname>>, don''t get mad. <<$gp_name>> is not just idiot, he is a rude idiot. We are definitely not asking you to be our whore or something like that."</font>'
 		'<font color=#<<$nd_font>>>"As <<$sp_name>> told you, we could decrease your rent if you would do some homekeeping stuff we really suck at. But only if you want, of course."</font>'
 		'<font color=#<<$sp_font>>>"So what do you say <<$pcs_firstname>>?"</font>'
-		act 'Say that you changed your mind about this':pavIntroStep = 40 & gt 'pavSharedApt', 'intro'
-		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & pavIntroStep = 10 & gt 'pavSharedApt', 'intro'
-		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & pavIntroStep = 20 & gt 'pavSharedApt', 'intro'
-		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & pavIntroStep = 30 & gt 'pavSharedApt', 'intro'
+		act 'Say that you changed your mind about this':pavIntroStep = 40 & gt 'pav_shared_apt', 'intro'
+		act 'Say you will pay the rent the normal way':pavSharedAptEnabled = 1 & pavIntroStep = 10 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind doing the homekeeping stuff':pavSharedAptEnabled = 1 & pavIntroStep = 20 & gt 'pav_shared_apt', 'intro'
+		act 'Say you don''t mind anything':pavSharedAptEnabled = 1 & pavIntroStep = 30 & gt 'pav_shared_apt', 'intro'
 	elseif pavIntroStep = 10:
 		minut += 2
 		'<font color=#<<$sp_font>>>"Fine. So the rest of this week you have for free, but you need to prepay the next week. OK?"</font>'
@@ -451,7 +451,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$gp_font>>>"See ya later girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later guys!"</font>'
 		servitudeLvl = 0
-		act 'Continue':pavIntroStep = 0 & gt 'pavSharedApt', 'rentSetup'
+		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
 	elseif pavIntroStep = 20:
 		minut += 2
 		'<font color=#<<$sp_font>>>"Fine. So the rest of this week you have for free, but you need to prepay the next week. OK?"</font>'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$gp_font>>>"See ya later girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later guys!"</font>'
 		servitudeLvl = 1
-		act 'Continue':pavIntroStep = 0 & gt 'pavSharedApt', 'rentSetup'
+		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
 	elseif pavIntroStep = 30:
 		minut += 2
 		'<font color=#<<$sp_font>>>"Fine. So the rest of this week you have for free, but you need to prepay the next week. OK?"</font>'
@@ -480,7 +480,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$gp_font>>>"See ya later girlie..."</font>'
 		'<font color=#<<$pcs_font>>>"Later guys!"</font>'
 		servitudeLvl = 2
-		act 'Continue':pavIntroStep = 0 & gt 'pavSharedApt', 'rentSetup'
+		act 'Continue':pavIntroStep = 0 & gt 'pav_shared_apt', 'rentSetup'
 	elseif pavIntroStep = 40:
 		minut += 2
 		'<font color=#<<$nd_font>>>"I told you idiot not to scare her away!"</font>'
@@ -488,7 +488,7 @@ if $ARGS[0] = 'intro':
 		'<font color=#<<$nd_font>>>"Just shut up already!"</font>'
 		''
 		'<font color=#<<$sp_font>>>"Sorry <<$pcs_firstname>>. We respect your decision. If you change your mind and room is still empty, let us know and we can talk again. Goodbye!"</font>'
-		act 'Tell them goodbye and leave':pavIntroStep = 0 & gt 'pavComplex', 'start'
+		act 'Tell them goodbye and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
 	elseif pavIntroStep = 50:
 		minut += 2
 		!add dialogue for returning after being previously expelled from apartment
@@ -503,7 +503,7 @@ if $ARGS[0] = 'intro':
 				'<font color=#<<$sp_font>>>"Are you certain you want to do this?"</font>'
 				'<font color=#<<$gp_font>>>"Sounds good to me!"</font>'
 				'<font color=#<<$nd_font>>>"hmmmm"</font>'
-				act 'Continue':gt 'pavSharedApt', 'intro'
+				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 			act 'I wont leave my children':
 				cla
@@ -512,11 +512,11 @@ if $ARGS[0] = 'intro':
 				'<font color=#<<$sp_font>>>"We understand"</font>'
 				'<font color=#<<$gp_font>>>"Damn"</font>'
 				'<font color=#<<$nd_font>>>"No problem <<$pcs_firstname>>"</font>'
-				act 'Continue':gt 'pavSharedApt', 'intro'
+				act 'Continue':gt 'pav_shared_apt', 'intro'
 			end
 		else
 			'<font color=#<<$pcs_font>>>OK, I understand.</font>'
-			act 'Thank them and leave':pavIntroStep = 0 & gt 'pavComplex', 'start'
+			act 'Thank them and leave':pavIntroStep = 0 & gt 'pav_complex', 'start'
 		end
 	end
 end
@@ -552,7 +552,7 @@ if $ARGS[0] = 'list':
 	'Signed: <a href="exec: gt ''pavShared_nd'', ''ndDick''"><font color=#<<$nd_font>>><<$nd_name>></font></a>, <a href="exec: gt ''pavShared_gp'', ''gpDick''"><font color=#<<$gp_font>>><<$gp_name>></font></a>, <a href="exec: gt ''pavShared_sp'', ''spDick''"><font color=#<<$sp_font>>><<$sp_name>></font></a>, <<$pcs_firstname>>.'
 	''
 	'---------------'
-	act 'Continue':gt 'pavSharedApt', 'start'
+	act 'Continue':gt 'pav_shared_apt', 'start'
 end
 
 ! paying with money
@@ -563,19 +563,19 @@ if $ARGS[0] = 'payRent':
 	'You just spent <<paid_rent>> cash.'
 	money -= paid_rent
 	gs 'stat'
-	act 'Continue': gs 'pavSharedApt', 'start'
+	act 'Continue': gs 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'bathroom':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'bathroom'
 	menu_off = 0
 	minut += 1
 	$location_type = 'bathroom'
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'bathroom'
 	$metkaM = 'bathroom'
-	$locM = 'pavSharedApt'
+	$locM = 'pav_shared_apt'
 
 	'<center><h3>Bathroom</h3></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
@@ -585,16 +585,16 @@ if $ARGS[0] = 'bathroom':
 	*nl
 	gs 'din_van', 'private'
 	gs 'stat'
-	act 'Leave':gt 'pavSharedApt', 'start'
+	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'kitchen':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'kitchen'
 	menu_off = 0
 	*clr & cla
 	minut += 2
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'kitchen'
 	$locclass = 'kitr'
 	gs 'stat'
@@ -628,7 +628,7 @@ if $ARGS[0] = 'kitchen':
 	if edahot > 0:'<a href="exec: dynamic $edahotd ">On the table is ready meal (0:30).</a>'
 	if edaD = 0 and eda = 0:'<b><font color="red">You have nothing to eat, the refrigerator is empty!</font></b>'
 
-	if hour = 6 or hour = 18:'<a href="exec: gt ''pavSharedApt'', ''cookForGuys''">Cook meals for the guys (1:30)</a>'
+	if hour = 6 or hour = 18:'<a href="exec: gt ''pav_shared_apt'', ''cookForGuys''">Cook meals for the guys (1:30)</a>'
 	
 	dynamic $edasnack
 	dynamic $driwater
@@ -639,14 +639,14 @@ if $ARGS[0] = 'kitchen':
 	dynamic $fatdel
 	dynamic $lekarstvo
 
-	act 'Leave':gt 'pavSharedApt', 'start'
+	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'cookForGuys':
 	menu_off = 1
 	cla
 	*clr
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'kitchen'
 	minut += 90
 	kuhdrova = 0
@@ -656,7 +656,7 @@ if $ARGS[0] = 'cookForGuys':
 	'You prepare three meals, using what you can from the guys food. Its not very healthy but you''re not planning to offer to do their shopping too.'
 	price = price_cook
 
-	act 'Leave the meal':gt 'pavSharedApt', 'payService'
+	act 'Leave the meal':gt 'pav_shared_apt', 'payService'
 end
 
 if $ARGS[0] = 'cleanForGuys':
@@ -675,21 +675,21 @@ if $ARGS[0] = 'cleanForGuys':
 	cumStainCh =  rand (0, 100)
 	if servitudeLvl = 2 and cumStainCh <= 50:'<i>You notice bedsheets with what seems as dried out cum. Probably remainder of one of yours "servings". Maybe it is really better to swallow everytime, you wonder?</i>'
 
-	act 'Hang them to dry out and leave':gt 'pavSharedApt', 'payService'
+	act 'Hang them to dry out and leave':gt 'pav_shared_apt', 'payService'
 end
 
 ! living room & pc bedroom
 if $ARGS[0] = 'pcsRoom':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'pcsRoom'
 	menu_off = 0
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'pcsRoom'
 	$location_type = 'private'
 	$locclass = 'bedr'
 	minut += 2
 	gs 'stat'
-	gs 'pavSharedApt', 'update'
+	gs 'pav_shared_apt', 'update'
 
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/sharedapt/bedroom/sofabed.jpg"></center>'
@@ -708,9 +708,9 @@ if $ARGS[0] = 'pcsRoom':
 	*nl
 	'There is no door to the living room, instead there''s <a href="exec:view''images/shared/sharedapt/bedroom/curtain.jpg''">curtain</a> covering entry to the room, which gives you a modicum of privacy; not much better than the state of the non-existant window curtains'
 
-	act '<b>Leave the room</b>':gt 'pavSharedApt', 'start'
+	act '<b>Leave the room</b>':gt 'pav_shared_apt', 'start'
 
-	act 'Sit on the sofa bed':gt 'pavSharedApt', 'sofabed'
+	act 'Sit on the sofa bed':gt 'pav_shared_apt', 'sofabed'
 
 	if obruch > 0: '<br>A hula hoop stands in corner of the room. '
 	if skak > 0: 'A jump rope is on a shelf. '
@@ -733,7 +733,7 @@ if $ARGS[0] = 'pcsRoom':
 			'<center><img <<$set_imgh>> src="images/pc/activities/study.jpg"></center>'
 			'You sit down on the sofa bed and do your coursework, you''ve finished <<kursovik>> percent of it.'
 
-			act 'Stand up':gt 'pavSharedApt', 'pcsRoom'
+			act 'Stand up':gt 'pav_shared_apt', 'pcsRoom'
 		end
 	end
 
@@ -753,7 +753,7 @@ if $ARGS[0] = 'pcsRoom':
 			'<center><img <<$set_imgh>> src="images/shared/drugs/dur.jpg"></center>'
 			'You snort some Pale Lady, feeling dizzy for just a moment. After that you feel fantastic, and incredibly horny.'
 
-			act 'Continue':gt 'pavSharedApt', 'pcsRoom'
+			act 'Continue':gt 'pav_shared_apt', 'pcsRoom'
 		end
 	end
 
@@ -769,7 +769,7 @@ if $ARGS[0] = 'pcsRoom':
 				minut += 15
 				gs'stat'
 				'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-				act'Set the tapestry aside':gt 'pavSharedApt', 'pcsRoom'
+				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
 			end
 		end
 		if newgobelen>=1:
@@ -788,7 +788,7 @@ if $ARGS[0] = 'pcsRoom':
 					gobelen += 1
 					'Your work on the tapestry is done.'
 				end
-				act'Set the tapestry aside':gt 'pavSharedApt', 'pcsRoom'
+				act'Set the tapestry aside':gt 'pav_shared_apt', 'pcsRoom'
 			end
 		end
 	end
@@ -815,10 +815,10 @@ if $ARGS[0] = 'pcsRoom':
 end
 	
 if $ARGS[0] = 'sofabed':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'sofabed'
 	menu_off = 0
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'sofabed'
 	*clr & cla
 	gs 'stat'
@@ -851,14 +851,14 @@ if $ARGS[0] = 'sofabed':
 			'You are not tired enough to sleep, even for a short nap.'
 		end
 	end
-	act 'Get up':gt 'pavSharedApt', 'pcsRoom'
+	act 'Get up':gt 'pav_shared_apt', 'pcsRoom'
 end
 
 if $ARGS[0] = 'ndRoom':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'ndRoom'
 	menu_off = 0
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'ndRoom'
 	minut += 2
 	'<center><h3><font color=#<<$nd_font>>><<$nd_name>>''s room</font></h3></center>'
@@ -880,19 +880,19 @@ if $ARGS[0] = 'ndRoom':
 	end
 	if servitudeLvl >= 1 and nd_cleaned = 0:
 		if poroshok >= 1:
-			act 'Clean the room':nd_cleaned = 1 & gt 'pavSharedApt', 'cleanForGuys'
+			act 'Clean the room':nd_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
 	end
-	act 'Leave':gt 'pavSharedApt', 'start'
+	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'gpRoom':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'gpRoom'
 	menu_off = 0
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'gpRoom'
 	minut += 2
 	'<center><h3><font color=#<<$gp_font>>><<$gp_name>>''s room</font></h3></center>'
@@ -913,19 +913,19 @@ if $ARGS[0] = 'gpRoom':
 	end
 	if servitudeLvl >= 1 and gp_cleaned = 0:
 		if poroshok >= 1:
-			act 'Clean the room':gp_cleaned = 1 & gt 'pavSharedApt', 'cleanForGuys'
+			act 'Clean the room':gp_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
 	end
-	act 'Leave':gt 'pavSharedApt', 'start'
+	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
 if $ARGS[0] = 'spRoom':
-	$menu_loc = 'pavSharedApt'
+	$menu_loc = 'pav_shared_apt'
 	$menu_arg = 'spRoom'
 	menu_off = 0
-	$loc = 'pavSharedApt'
+	$loc = 'pav_shared_apt'
 	$metka = 'spRoom'
 	minut += 2
 	'<center><h3><font color=#<<$sp_font>>><<$sp_name>>''s room</font></h3></center>'
@@ -948,13 +948,13 @@ if $ARGS[0] = 'spRoom':
 	end
 	if servitudeLvl >= 1 and sp_cleaned = 0:
 		if poroshok >= 1:
-			act 'Clean the room':sp_cleaned = 1 & gt 'pavSharedApt', 'cleanForGuys'
+			act 'Clean the room':sp_cleaned = 1 & gt 'pav_shared_apt', 'cleanForGuys'
 		else
 			'You don''t have enough laundry detergent to clean the room'
 		end
 	end
-	act 'Leave':gt 'pavSharedApt', 'start'
+	act 'Leave':gt 'pav_shared_apt', 'start'
 end
 
---- pavSharedApt ---------------------------------
+--- pav_shared_apt ---------------------------------
 

locations/pavstation.qsrc → locations/pav_station.qsrc

@@ -1,8 +1,8 @@
-# pavstation
+# pav_station
 
 if $ARGS[0] = 'station_outside':
 	*clr & cla
-	$menu_loc = 'pavstation'
+	$menu_loc = 'pav_station'
 	$menu_arg = 'station_outside'
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -11,8 +11,8 @@ if $ARGS[0] = 'station_outside':
 	'The police station is gleaming in a bright yellow color, clearly making it clear that it can''t be missed by anyone in Pavlovsk.'
 	'The police officers are usually often misusing their power since no one further up the chain is giving a damn about a sleepy little town.'
 	
-	act 'Return to the train station area': minut += 3 & gt 'pavtrainhall'
-	act 'Enter the police station': minut += 1 & gt 'pavstation', 'station_inside'
+	act 'Return to the train station area': minut += 3 & gt 'pav_train_hall'
+	act 'Enter the police station': minut += 1 & gt 'pav_station', 'station_inside'
 end
 
 if $ARGS[0] = 'station_inside':
@@ -24,8 +24,8 @@ if $ARGS[0] = 'station_inside':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
 	'You are welcomed by a tiny reception area with someone always just lazily hanging around waiting for something to happen. The whole interior has seen better days and you''re reminded by the stories you''ve heard from your parents about how everything used to look run-down during their younger days.'
 	
-	act 'Leave the station': minut += 1 & gt 'pavstation', 'station_outside'
-	act 'Approach the reception area': minut += 2 & gt 'pavstation', 'reception'
+	act 'Leave the station': minut += 1 & gt 'pav_station', 'station_outside'
+	act 'Approach the reception area': minut += 2 & gt 'pav_station', 'reception'
 	if katalkinSexOnce = 1 and hour >= 8: minut += 1 & act 'Visit Captain Katalkin': gt 'katalkin'
 end
 		
@@ -48,7 +48,7 @@ if $ARGS[0] = 'reception':
 		'"Said no one ever," the clerk quickly counters, "Listen, I don''t know what you''re up to but you need to leave quickly before I have one of the officers come out here and lock you up."'
 		'Hearing those words you quickly turn around and head towards the door...'
 		
-		act 'Walk away from the clerk': minut += 2 & gt 'pavstation', 'station_inside'
+		act 'Walk away from the clerk': minut += 2 & gt 'pav_station', 'station_inside'
 	end
 	
 	act 'Report a crime':
@@ -63,8 +63,8 @@ if $ARGS[0] = 'reception':
 		'"B-But I-I..." you stutter.'
 		'"No nothing, there''s the door." he points toward the door.'
 		
-		act 'Walk away from the clerk': minut += 2 & gt 'pavstation', 'station_inside'
+		act 'Walk away from the clerk': minut += 2 & gt 'pav_station', 'station_inside'
 	end
 end
 
---- pavstation ---------------------------------
+--- pav_station ---------------------------------

locations/pavtrain.qsrc → locations/pav_train.qsrc

@@ -1,8 +1,8 @@
-# pavtrain
+# pav_train
 
-$loc = 'pavtrain'
+$loc = 'pav_train'
 $metka = ''
-$menu_loc = 'pavtrain'
+$menu_loc = 'pav_train'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'public_outdoors'
@@ -22,9 +22,9 @@ gs 'stat'
 '<center><h2>Pavlovsk''s train station</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 *nl
-'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>. Attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pavstation'', ''station_outside''">police station</a> of Pavlovsk. '
+'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
-'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pavtrain_market'', ''start''">market</a> on most days.'
+'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
@@ -181,7 +181,7 @@ act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to the Old Town (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
-act 'Enter the station building': minut += 3 & gt 'pavtrainhall'
+act 'Enter the station building': minut += 3 & gt 'pav_train_hall'
 
---- pavtrain ---------------------------------
+--- pav_train ---------------------------------
 

locations/pavtrainhall.qsrc → locations/pav_train_hall.qsrc

@@ -1,9 +1,9 @@
-# pavtrainhall
+# pav_train_hall
 
 if $ARGS[0] = '':
 	$metka = ''
-	$loc = 'pavtrainhall'
-	$menu_loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = ''
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -18,7 +18,7 @@ if $ARGS[0] = '':
 	'<center><h2>Pavlovsk train station interior</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	*nl
-	'Stepping into the station building you are greated by a large waiting room, where passengers await the trains. In one of the corners you can clearly see the <a href="exec: gt ''pavtrainhall_events'', ''manager''">station manager''s office</a>. The <a href="exec:minut += 1 & gt ''pavtrainhall'', ''toilet''">toilets</a> are located farthest back of the building.'
+	'Stepping into the station building you are greated by a large waiting room, where passengers await the trains. In one of the corners you can clearly see the <a href="exec: gt ''pav_train_hall_events'', ''manager''">station manager''s office</a>. The <a href="exec:minut += 1 & gt ''pav_train_hall'', ''toilet''">toilets</a> are located farthest back of the building.'
 	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	*nl
@@ -50,24 +50,24 @@ if $ARGS[0] = '':
 	if podbros = 0:
 		podrand = rand(0, 1)
 
-		if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 0:'As you walk through the station building, you notice a man''s thick <a href="exec: gt ''pavtrainhall_events'', ''wallet1''">wallet</a> fall out from his pocket, not far away from you.'
+		if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 0:'As you walk through the station building, you notice a man''s thick <a href="exec: gt ''pav_train_hall_events'', ''wallet1''">wallet</a> fall out from his pocket, not far away from you.'
 		*nl
 	end
 
-	act 'Leave the train station':minut += 3 & gt 'pavtrain'
+	act 'Leave the train station':minut += 3 & gt 'pav_train'
 
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to the platforms': gt 'pavtrainhall', 'platform'
+		act 'Go to the platforms': gt 'pav_train_hall', 'platform'
 	else
-		act 'Go to the ticket office': gt 'pavtrainhall', 'ticket'
+		act 'Go to the ticket office': gt 'pav_train_hall', 'ticket'
 	end
 
 	if snarkozak = 1 and narkossista = 0 and narkozakday ! day and money >= 1500: act 'Find the drug dealer':gs 'events', 'snarkozaka'
 
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:
-			act 'Work': gt 'pavtrainhall', 'work'
+			act 'Work': gt 'pav_train_hall', 'work'
 		elseif cleZarplatDay ! daystart:
 			cleZarplatDay = daystart
 			cleanDailypay += 250
@@ -87,7 +87,7 @@ if $ARGS[0] = '':
 			minut += 3
 			gs 'stat'
 			'When you are done cleaning all the places you were told to clean, you go to the cashier and collect your well-earned salary.'
-			act 'Continue':minut += 1 & gt 'pavtrainhall'
+			act 'Continue':minut += 1 & gt 'pav_train_hall'
 		end
 	end
 
@@ -115,16 +115,16 @@ if $ARGS[0] = '':
 	if poezddalsled = 1:
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 
-		if tovarL > 0:act 'Sell your goods to passengers':gt 'pavtrainhall_events', 'trinkets'
+		if tovarL > 0:act 'Sell your goods to passengers':gt 'pav_train_hall_events', 'trinkets'
 	end
 
 	act 'Wait':gs 'obj_din', 'wait'
 end
 
 if $ARGS[0] = 'platform':
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'platform'
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'platform'
 	menu_off = 0
 	$location_type = 'public_outdoors'
@@ -149,17 +149,17 @@ if $ARGS[0] = 'platform':
 	*nl
 	if week >= 6 and hour >= 9 and hour <= 10:'You notice <a href="exec:gt ''gschool_socialchg1'', ''tBella''">Bella</a> standing at the train station platform, looking at the time table.'
 
-	act 'Enter the station building': gt'pavtrainhall'
+	act 'Enter the station building': gt'pav_train_hall'
 
 	if Trainpass_day > daystart:
 
-		act 'Take the train to the village of Gadukino': gt 'pavtrainhall', 'village'
+		act 'Take the train to the village of Gadukino': gt 'pav_train_hall', 'village'
 
-		act 'Take the train to the communal village': gt 'pavtrainhall', 'communal'
+		act 'Take the train to the communal village': gt 'pav_train_hall', 'communal'
 
-		act 'Take the train to city industrial area': gt 'pavtrainhall', 'ind'
+		act 'Take the train to city industrial area': gt 'pav_train_hall', 'ind'
 
-		act 'Take the train to city center': gt 'pavtrainhall', 'centre'
+		act 'Take the train to city center': gt 'pav_train_hall', 'centre'
 	end
 end
 
@@ -178,7 +178,7 @@ if $ARGS[0] = 'work':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and mop the station building floor.'
 
-			act 'Continue':minut += 1 & gt 'pavtrainhall', 'work'
+			act 'Continue':minut += 1 & gt 'pav_train_hall', 'work'
 		end
 	end
 
@@ -191,10 +191,10 @@ if $ARGS[0] = 'work':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and head into the men''s restroom.'
-			gs 'pavtrainhall_events', 'toilet_event'
+			gs 'pav_train_hall_events', 'toilet_event'
 			!!'You began to wash the floor in the men''s room, and then began to scrub toilets.' <== How exciting! <3 VK
 
-			act 'Leave restroom':minut += 1 & gt 'pavtrainhall', 'work'
+			act 'Leave restroom':minut += 1 & gt 'pav_train_hall', 'work'
 		end
 	end
 
@@ -207,16 +207,16 @@ if $ARGS[0] = 'work':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' restroom before you finish up by mopping the floor.'
-			gs 'pavtrainhall_events', 'vera'
+			gs 'pav_train_hall_events', 'vera'
 
-			act 'Leave restroom':minut += 1 & gt 'pavtrainhall', 'work'
+			act 'Leave restroom':minut += 1 & gt 'pav_train_hall', 'work'
 		end
 	end
-	act 'Return': gt 'pavtrainhall'
+	act 'Return': gt 'pav_train_hall'
 end
 
 if $ARGS[0] = 'ticket':
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'ticket'
 	menu_off = 0
 	*clr & cla
@@ -224,12 +224,12 @@ if $ARGS[0] = 'ticket':
 	'<center><h2>Ticket office</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg"></center>'
 
-	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
+	act 'Leave the ticket office':minut += 1 & gt 'pav_train_hall'
 
 	if money >= 50:
 		act 'Buy a ticket':
 			cla
-			gs 'pavtrainhall', 'buy_ticket'
+			gs 'pav_train_hall', 'buy_ticket'
 		end
 	end
 
@@ -238,7 +238,7 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'pavtrainhall'
+			act 'Return': gt 'pav_train_hall'
 		end
 	end
 
@@ -247,36 +247,36 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'pavtrainhall'
+			act 'Return': gt 'pav_train_hall'
 		end
 	end
 end
 
 if $ARGS[0] = 'buy_ticket':
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'buy_ticket'
 	menu_off = 0
 
-	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
+	act 'Leave the ticket office':minut += 1 & gt 'pav_train_hall'
 
 	if money >= 75:
 		act 'Buy a ticket to the village of Gadukino (75 <b>₽</b>)':
 			money -= 75
-			gt 'pavtrainhall', 'village'
+			gt 'pav_train_hall', 'village'
 		end
 	end
 
 	if money >= 100:
 		act 'Buy a ticket to the communal village (100 <b>₽</b>)':
 			money -= 100
-			gt 'pavtrainhall', 'communal'
+			gt 'pav_train_hall', 'communal'
 		end
 	end
 
 	if money >= 125:
 		act 'Buy a ticket to city industrial area (125 <b>₽</b>)':
 			money -= 125
-			gt 'pavtrainhall', 'ind'
+			gt 'pav_train_hall', 'ind'
 		end
 	end
 
@@ -284,7 +284,7 @@ if $ARGS[0] = 'buy_ticket':
 		act 'Buy a ticket to city center (150 <b>₽</b>)':
 			money -= 150
 			if rand(0,10) = 0: gt 'train', 'weed'
-			gt 'pavtrainhall', 'centre'
+			gt 'pav_train_hall', 'centre'
 		end
 	end
 end
@@ -322,7 +322,7 @@ if $ARGS[0] = 'communal':
 end
 
 if $ARGS[0] = 'ind':
-	$loc = 'nordtrain'
+	$loc = 'city_industrial_train'
 	$metka = 'platform'
 	menu_off = 1
 	minut += 35
@@ -335,12 +335,12 @@ if $ARGS[0] = 'ind':
 	'After 35 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'nordtrain', 'platform'
+		gt 'city_industrial_train', 'platform'
 	end
 end
 
 if $ARGS[0] = 'centre':
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$metka = 'inside'
 	menu_off = 1
 	minut += 40
@@ -353,12 +353,12 @@ if $ARGS[0] = 'centre':
 	'After 40 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 rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'cityTrain', 'inside'
+		gt 'city_train', 'inside'
 	end
 end
 
 if $ARGS[0] = 'toilet':
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'toilet'
 	menu_off = 0
 	*clr & cla
@@ -368,17 +368,17 @@ if $ARGS[0] = 'toilet':
 	'<center><h2>Pavlovsk train station interior</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	*nl
-	'You stand by the station''s restrooms, you see the <a href="exec:minut += 1 & gt ''pavtrainhall'', ''female''">ladies'' restroom</a> to the right and <a href="exec:minut += 1 & gt ''pavtrainhall'', ''male''">men''s restroom</a> to the left, clearly marked by signs on the door.'
+	'You stand by the station''s restrooms, you see the <a href="exec:minut += 1 & gt ''pav_train_hall'', ''female''">ladies'' restroom</a> to the right and <a href="exec:minut += 1 & gt ''pav_train_hall'', ''male''">men''s restroom</a> to the left, clearly marked by signs on the door.'
 
-	act 'Return to the train station':minut += 1 & gt 'pavtrainhall'
+	act 'Return to the train station':minut += 1 & gt 'pav_train_hall'
 end
 
 if $ARGS[0] = 'female':
-	$locM = 'pavtrainhall'
+	$locM = 'pav_train_hall'
 	$metkaM = 'female'
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'female'
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'female'
 	menu_off = 0
 	$location_type = 'bathroom'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'female':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	'You open the door to the ladies'' restroom and head inside.'
 
-	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
+	act 'Leave':minut += 1 & gt 'pav_train_hall', 'toilet'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 
@@ -400,11 +400,11 @@ if $ARGS[0] = 'female':
 end
 
 if $ARGS[0] = 'male':
-	$locM = 'pavtrainhall'
+	$locM = 'pav_train_hall'
 	$metkaM = 'male'
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'male'
-	$menu_loc = 'pavtrainhall'
+	$menu_loc = 'pav_train_hall'
 	$menu_arg = 'male'
 	menu_off = 0
 	$location_type = 'bathroom'
@@ -415,7 +415,7 @@ if $ARGS[0] = 'male':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	'You open the door to the men''s restroom and head inside.'
 
-	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
+	act 'Leave':minut += 1 & gt 'pav_train_hall', 'toilet'
 
 	if bimbolevel >= 1:
 		act 'Wait and see if someone finds you':gt 'trainbimbo', 'pos1'
@@ -429,5 +429,5 @@ if $ARGS[0] = 'male':
 	dynamic $basin
 end
 
---- pavtrainhall ---------------------------------
+--- pav_train_hall ---------------------------------
 

locations/pavtrainhall_events.qsrc → locations/pav_train_hall_events.qsrc

@@ -1,4 +1,4 @@
-# pavtrainhall_events
+# pav_train_hall_events
 
 if $ARGS[0] = 'manager':
 	*clr & cla
@@ -8,7 +8,7 @@ if $ARGS[0] = 'manager':
 	'"Cleaner wanted! 2 hours per day at any time, salary 250 <b>₽</b>. Ask the station manager for more information."'
 	'"Office visiting hours: 08:00 - 17:00"'
 
-	act 'Return to the train station':minut += 1 & gt 'pavtrainhall'
+	act 'Return to the train station':minut += 1 & gt 'pav_train_hall'
 
 	if hour >= 8 and hour <= 16:
 		act 'Enter the office':
@@ -16,7 +16,7 @@ if $ARGS[0] = 'manager':
 			gs 'stat'
 			'You knock on the door and enter the station manager''s office. An elderly man looks up from his papers on his desk and says, "Can I help you?"'
 
-			act 'Apologize and leave':minut += 1 & gt 'pavtrainhall'
+			act 'Apologize and leave':minut += 1 & gt 'pav_train_hall'
 
 			if vokzalVork = 0:
 				act 'Apply for the cleaning job':
@@ -29,7 +29,7 @@ if $ARGS[0] = 'manager':
 					'He explains what you have to do while he takes your details: "Your job would be to wash the station floor, and clean both the restrooms. You can come work on any day you like, and can skip any day you don''t want to work."'
 					'"You have to clean all three areas before the end of the day, otherwise we have to hire someone else finish it. If you have only cleaned part of the rooms, you do not get paid at all." In conclusion he shows you the maintenance closet where the cleaning supplies are stored and shakes your hand, before returning to his work.'
 
-					act 'Leave the office':minut += 1 & gt 'pavtrainhall'
+					act 'Leave the office':minut += 1 & gt 'pav_train_hall'
 				end
 			end
 		end
@@ -52,10 +52,10 @@ if $ARGS[0] = 'wallet1':
 		'You tell the girl to get lost, and quickly push her away and snag the wallet before she can protest. As you remove the money from it and stuff it in your pocket, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to... that girl must have ratted you out!'
 		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
 
-		act 'Give him back the money you stole': gt 'pavtrainhall_events', 'wallet2'
+		act 'Give him back the money you stole': gt 'pav_train_hall_events', 'wallet2'
 	end
 
-	act 'Let her have the wallet and leave':minut += 1 & gt 'pavtrainhall'
+	act 'Let her have the wallet and leave':minut += 1 & gt 'pav_train_hall'
 
 	act 'Share the money':
 		*clr & cla
@@ -65,7 +65,7 @@ if $ARGS[0] = 'wallet1':
 		'You pick up the wallet and drag the girl off to the side. Making sure you are not being watched, you quickly split the money in two even piles and give her half. She quickly walks away while you put your share in your pocket. Suddenly, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to...'
 		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
 
-		act 'Give him back the money you stole': gt 'pavtrainhall_events', 'wallet2'
+		act 'Give him back the money you stole': gt 'pav_train_hall_events', 'wallet2'
 	end
 end
 
@@ -84,7 +84,7 @@ if $ARGS[0] = 'wallet2':
 		'You don''t want a scandal. Who knows what could happen if you get arrested for theft? Hoping to placate him with a few bills of your own money, you decide to get your wallet. You pull out your own money, and start to count some of it out. Before you can finish, he pulls the entire pile out of your hands: "There it is! You''re lucky, girl... I''ll leave it at this, for just this once."'
 		'Before you can object, he walks away with all of your money.'
 		
-		act 'Leave':minut += 1 & gt 'pavtrainhall'
+		act 'Leave':minut += 1 & gt 'pav_train_hall'
 	end
 end
 
@@ -120,7 +120,7 @@ if $ARGS[0] = 'vera':
 						'Vera looks at you suspiciously: "Really? That''s exactly what those school sluts would say, defending him like that..."'
 						'She shakes her head and waves you away so she can get back to work, giving you a mistrusting look as you leave.'
 
-						act 'Leave':minut += 1 & gt 'pavtrainhall'
+						act 'Leave':minut += 1 & gt 'pav_train_hall'
 					end
 
 					act 'Suck up to Vera':
@@ -132,7 +132,7 @@ if $ARGS[0] = 'vera':
 						'You can see she needs some encouragement, and decide to placate her: "You''re still very attractive, Vera! Anatoly doesn''t know what he''s missing!"'
 						'She gives you an appreciative nod. After another minute of trash-talking the girls in school just like you, she realizes she has to get back to work. She waves you goodbye as you gather your things and get ready to leave. You''re not quite sure whether she was just insulting you or not.'
 
-						act 'Leave':minut += 1 & gt 'pavtrainhall'
+						act 'Leave':minut += 1 & gt 'pav_train_hall'
 					end
 
 					exit
@@ -163,11 +163,11 @@ if $ARGS[0] = 'vera':
 								if veraboyrand > 8:
 								 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 									'Vera lets out a wistful sigh, and shrugs: "I don''t know... there''s not much to tell. I live with Anatoly now, and I slowly feel my virginity coming back to me. We never do anything together any more."'
-									act 'Leave':minut += 1 & gt'pavtrainhall'
+									act 'Leave':minut += 1 & gt'pav_train_hall'
 								elseif veraboyrand <0:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 									'Vera lets out a wistful sigh and shrugs: "I don''t know <<$pcs_nickname>>, I don''t feel like talking more about the past right now."'
-									act 'Leave':minut += 1 & gt'pavtrainhall'
+									act 'Leave':minut += 1 & gt'pav_train_hall'
 								end
 
 								if veraboyrand = 0:
@@ -178,7 +178,7 @@ if $ARGS[0] = 'vera':
 									'I was just laying there with my legs spread, under his sweaty body, while he was pounding me. Then he pulls out and shoots his sperm all over my stomach. So there I was, on my back... all covered in semen, my pussy all bloody, and what do you think he said!? He said I was like a log... he complained how he had to do all the work! That jerk didn''t even realize he robbed me of my innocence!'
 									'I got angry and left immediately, and never saw him again after that. At least no one in the village found out... I was so ashamed! For a month, I hid from everyone and didn''t even go for a walk, I couldn''t look anyone in the eye after losing my virginity like that."'
 
-									act 'Leave':minut += 1 & gt 'pavtrainhall'
+									act 'Leave':minut += 1 & gt 'pav_train_hall'
 								elseif veraboyrand = 1:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk1.jpg"></center>'
 									'Vera gets ready to continue her story: "After that first experience, I was done with guys. Until one day at college... I met Oleg there, while I was working towards my undergraduate degree. He was a very bulky and muscular guy, and great at cycling. I bet he could bend a bicycle, if he wanted to... he was that strong. To my surprise he invited me for a drink one day. We went to a local cafe, and had a great time. He was such a nice guy!'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'vera':
 											'You can''t argue with that, and nod: "I guess that is kind of a slutty thing to do... I can see where he''s coming from."'
 											'Vera shakes her head in disappointment, still stuck in her own thoughts: "Though I don''t know... didn''t he do the exact same thing, taking me home and fucking me on the very first day we met? Why is it always the girl''s fault?"'
 
-											act 'Leave':minut += 1 & gt 'pavtrainhall'
+											act 'Leave':minut += 1 & gt 'pav_train_hall'
 										end
 
 										act 'Tell her he was wrong to ignore her':
@@ -217,7 +217,7 @@ if $ARGS[0] = 'vera':
 											'You notice Vera is sad and try to cheer her up: "He shouldn''t have treated you like that! He was just as happy to take you home the first day you met!"'
 											'She gives you a weak smile as she sighs: "I know, right? Why is the girl always at fault, when the guys do the same thing? It''s not fair..."'
 
-											act 'Leave':minut += 1 & gt 'pavtrainhall'
+											act 'Leave':minut += 1 & gt 'pav_train_hall'
 										end
 									end
 								elseif veraboyrand = 2:
@@ -233,7 +233,7 @@ if $ARGS[0] = 'vera':
 										'You indignantly say: "You hated him... why? I thought you liked being treated like a piece of meat?"'
 										'Vera shakes her head wearily: "Maybe, but that doesn''t give him the right to just fuck my ass like that, with no concern for my feelings!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"Understandable"':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'vera':
 										'You nod understandingly, saying he had no right to treat Vera like that.'
 										'Vera sighs sadly: "You know, secretly I actually kind of liked him. But it was really wrong of him to take advantage of a defenseless girl like that. And besides... who knows how many other girls he treated like that before me?"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 3:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk3.jpg"></center>'
@@ -262,7 +262,7 @@ if $ARGS[0] = 'vera':
 										'You snark: "Of course it does! Giving some random guy you had never met until 10 minutes ago a blowjob in the toilet stalls, and letting him cum all over your face... if that''s not slutty, I don''t know what is!"'
 										'Faith tries to defend herself, unhappy you''re calling her out: "Hey come on, it''s not like I was doing it just for him! I had an orgasm as well, and I really needed that... is that so wrong?"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"No way, you were just having fun!"':
@@ -274,7 +274,7 @@ if $ARGS[0] = 'vera':
 										'You give her a knowing smile as you shake your head: "No way! You were both consenting adults, and you both had an orgasm..."'
 										'She smiles when she notices you''re not judging her: "Exactly! We were just having some fun, not doing anyone any harm... there''s nothing wrong with that!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 4:
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/sex/anal/dog2.jpg"></center>'
@@ -290,7 +290,7 @@ if $ARGS[0] = 'vera':
 										'You can''t hide your disgust, and exclaim: "Anal sex? Urgh! That''s disgusting!"'
 										'Vera just gives you a disappointed look as she grins: "Oh dear... <<$pcs_nickname>>, you''re such a prude!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"Wow, that sounds hot!"':
@@ -302,7 +302,7 @@ if $ARGS[0] = 'vera':
 										'You give Vera a knowing grin: "Wow, anal every day... that sounds so hot!"'
 										'She smiles at you: "After some practise, it was really easy to relax my ass enough to take his dick in without any pain. And the orgasms... wow, they were heavenly!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 5:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk5.jpg"></center>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'vera':
 										'You shake your head in disbelief when you say: "Two at once!? I know you liked Leszek, but wow! That''s so slutty! And for so long, too! He must''ve just thought of you as a piece of meat, that whole time."'
 										'Vera doesn''t like your tone, and tries to defend herself: "Hey, Leszek was my boyfriend, and I know he loved me too! I really loved him... I just pretended his friend wasn''t really there, I only did it to make Leszek happy!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"Two guys at once? Good for you!"':
@@ -334,7 +334,7 @@ if $ARGS[0] = 'vera':
 										'You grin at Vera: "Two guys at once, whenever you wanted! Wow, that sounds like it could be fun! You''re so lucky, Vera!"'
 										'She nods at you, fondly remembering that time even though she won''t admit it: "Oh yes... two guys at once is definitely an interesting experience, but if you ask me it''s still better to be able to devote all your attention to one person."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 6:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk6.jpg"></center>'
@@ -350,7 +350,7 @@ if $ARGS[0] = 'vera':
 										'You listen to her story covering your mouth with your hand, and when she finishes you exclaim: "No way, that poor guy! He must''ve thought you were a huge whore, I can''t believe you did that on your first time!"'
 										'Vera just shrugs, unhappy you''re taking his side: "Hey, you don''t know what it''s like! When your former boyfriend fucked you together with his friend almost daily for years on end, you can''t just go back to boring vanilla sex! Lesko just wasn''t ready for me, I bet he regrets it now..."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"He just wasn''t right for you!"':
@@ -362,7 +362,7 @@ if $ARGS[0] = 'vera':
 										'You encourage her: "He doesn''t know what he''s missing, Vera! I can understand he''d be a bit surprised at first, but after a while a lot of men would love to have a girl who''s a bit more experienced and open to trying other things!"'
 										'Vera smiles at you as she nods: "It was a big step back, from getting fucked daily by two guys for several years in all my holes! I was just used to getting satisfied like that. I wonder if he regrets walking out on me now... I bet I would''ve satisfied him in more ways than any other girl ever could!"'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 7:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk7.jpg"></center>'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'vera':
 										'You shake your head in disbelief, and say: "Wow... it sounds like you finally met a good guy. I can''t believe you let him go!"'
 										'She haughtily replied: "Hardly. In bed he never lasted long, he''d get on top of me and finish within 30 seconds! The few times I got him to lick me, he never even got close to my asshole... he pretended it wasn''t even there! There were so many times I just wanted to beg him to fuck my ass hard and make me cum! You''ll see what I mean, <<$pcs_nickname>>. If your man doesn''t want to try things, you''ll remember this conversation, and you''ll realize that I''m right. Life is too short to spend with a man who doesn''t satisfy you."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"He wasn''t right for you either!"':
@@ -390,7 +390,7 @@ if $ARGS[0] = 'vera':
 										'You nod understandingly and say: "That sounds awful! He sounds so boring... there are so many things you can do with your body, if you''re open to the idea of trying new things!"'
 										'She grins: "Exactly! With the experience I had, getting fucked by two guys at once almost daily, there''s no way I could see myself spend the rest of my days like that! And I knew he wouldn''t change... so I had to let him go."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								elseif veraboyrand = 8:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk8.jpg"></center>'
@@ -409,7 +409,7 @@ if $ARGS[0] = 'vera':
 										'You look at Vera in disbelief, never having expected this end to her story: "Prostitution!? That''s terrible Vera, how could you!?"'
 										'She hangs her head in shame for a moment, but then rebounds: "I was just a young naive girl <<$pcs_nickname>>, who thought her pussy could conquer the world. It was foolish of me, but I''ve paid my dues and ended up just fine. Things could''ve been a lot worse."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 
 									act '"At least you ended up doing okay!"':
@@ -421,7 +421,7 @@ if $ARGS[0] = 'vera':
 										'You put your hand on her shoulder and try to cheer her up: "Hey, everyone makes mistakes! At least you ended up okay!"'
 										'Vera gives you a bittersweet smile: "Yea... I guess I did. Anatoly doesn''t satisfy me in the slightest, but life with him is still better than some of the other things I''ve seen. I guess I should be grateful for that."'
 
-										act 'Leave':minut += 1 & gt 'pavtrainhall'
+										act 'Leave':minut += 1 & gt 'pav_train_hall'
 									end
 								end
 							end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'vera':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/lvtalk.jpg"></center>'
 								'Vera smirks, noticing your sudden interest. She tells you the story without much enthusiasm: "There was a girl in college, we got along just fine. Then one night when we got a bit drunk, she started to kiss me! Before I knew it, her head was between my legs... she sure knew what she was doing. It felt nice, but I couldn''t quite reach an orgasm... the thought of having a girl between my legs was just too weird. We tried a few more times, playing with each other''s boobs and pussy, I licked her asshole too. It just wasn''t for me. Nothing beats a hard cock to ride and stretch all your holes out with <<$pcs_nickname>>, trust me."'
 
-								act 'Leave':minut += 1 & gt 'pavtrainhall'
+								act 'Leave':minut += 1 & gt 'pav_train_hall'
 							end
 						end
 					elseif veratalkrand = 3:
@@ -455,13 +455,13 @@ if $ARGS[0] = 'vera':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 								'You''re not sure whether you want her to tell you about your teacher''s sex life, but ask anyway. Vera doesn''t give it a second thought, and says: "I guess it''s the classic story. During the honeymoon phase, everything is great. He was always ready to go, and open to try new things. We fucked a lot, those first months. Every day, all night long, in my ass while I was on my period... we just never stopped. But now, he barely even notices me any more. I wonder if he''s fucking any of those sluts in his classes... it''s not fair <<$pcs_nickname>>, how do I compete with those girls?"'
 
-								act 'Leave':minut += 1 & gt 'pavtrainhall'
+								act 'Leave':minut += 1 & gt 'pav_train_hall'
 							end
 						end
 					end
 				end
 				killvar 'veratalkrand'
-				act 'Leave':minut += 1 & gt 'pavtrainhall'
+				act 'Leave':minut += 1 & gt 'pav_train_hall'
 			elseif npc_rel['A27'] <= 0:
 				'You approach Vera, happy to have another chat to break the monotony of the day. She''ll have none of it though, and waves you away: "Leave me alone <<$pcs_nickname>>, I don''t want to talk to you."'
 
@@ -479,10 +479,10 @@ if $ARGS[0] = 'vera':
 						'Vera nods: "Thanks <<$pcs_nickname>>, I appreciate the apology. I guess I should forgive you."'
 					end
 
-					act 'Leave':minut += 1 & gt 'pavtrainhall'
+					act 'Leave':minut += 1 & gt 'pav_train_hall'
 				end
 
-				act 'Leave':minut += 1 & gt 'pavtrainhall'
+				act 'Leave':minut += 1 & gt 'pav_train_hall'
 			end
 		end
 	elseif verakassir = 2 and hour >= 8 and hour <= 20 and verarand = 0:
@@ -497,7 +497,7 @@ if $ARGS[0] = 'vera':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 			'You put your cleaning supplies aside and walk over to Vera to have a chat with her while she also seems to be having a slow day. After a while, the topic ends up being her sex life. Vera complains how her husband doesn''t satisfy her in bed.'
 
-			act 'Leave':minut += 1 & gt 'pavtrainhall'
+			act 'Leave':minut += 1 & gt 'pav_train_hall'
 		end
 	elseif verakassir = 1 and hour >= 8 and hour <= 20 and verarand = 0:
 		'The cashier in the ticket office is having a cigarette break, you could go have a chat. You know her name is Vera.'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'vera':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 			'You go and chat for a few minutes with Vera while she smokes her cigarette, exchanging stories of how your days have been. During your talk, you learn that Vera is married and has a child. It turns out she''s the mother of Valeria Tsarev, the girl in your class you know as Lera. That means her husband must be Anatoly E. Tsarev, one of the teachers at school.'
 
-			act 'Leave':minut += 1 & gt 'pavtrainhall'
+			act 'Leave':minut += 1 & gt 'pav_train_hall'
 		end
 	elseif verakassir = 0 and hour >= 8 and hour <= 20:
 		'While you''re on your way to clean the ladies'' restroom, you see the cashier in the ticket office look at you. She gives you a friendly nod while she smokes a cigarette, and you decide you could go for a quick break and have a chat if you feel like it.'
@@ -531,7 +531,7 @@ if $ARGS[0] = 'vera':
 			'This sounds interesting! You thank her: "Thanks for the tip, maybe I will! By the way, my name is <<$pcs_nickname>>."'
 			'She smiles as she replies: "Vera Tsarev, pleased to meet you. I have to get back to work now, I''ll be seeing you around!"'
 
-			act 'Leave':minut += 1 & gt 'pavtrainhall'
+			act 'Leave':minut += 1 & gt 'pav_train_hall'
 		end
 	end
 	killvar 'verarand'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'toilet_event':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+					act 'Leave':minut += 1 & gt 'pav_train_hall', 'work'
 				end
 			end
 		elseif vokmantoitipev = 2:
@@ -602,7 +602,7 @@ if $ARGS[0] = 'toilet_event':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+					act 'Leave':minut += 1 & gt 'pav_train_hall', 'work'
 				end
 			end
 		elseif vokmantoitipev = 3:
@@ -626,7 +626,7 @@ if $ARGS[0] = 'toilet_event':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+					act 'Leave':minut += 1 & gt 'pav_train_hall', 'work'
 				end
 			end
 		end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'trinkets':
 		if pcs_intel + pcs_prcptn > 80 and rand(0,5) = 5:
 			'Two police officers had been keeping an eye on you while you were trying to sell your goods, and when you move to leave the platform they move to intercept you, but you time your leaving with a large group of students and hide yourself amongst them. The police officers get caught up in the crowd and your route clear opens up.'
 
-			act 'Leave':minut += 1 & gt 'pavtrainhall'
+			act 'Leave':minut += 1 & gt 'pav_train_hall'
 		exit
 
 		else
@@ -683,7 +683,7 @@ if $ARGS[0] = 'trinkets':
 				'You look around and, when you''re sure the coast is clear, stick out your hand with a 500 <b>₽</b> note in it.'
 				'The police officers smile at you and quickly take the money before they walk away: "I see everything''s in order. Have a nice day, miss."'
 
-				act 'Leave':minut += 1 & gt 'pavtrainhall'
+				act 'Leave':minut += 1 & gt 'pav_train_hall'
 			end
 		end
 
@@ -702,7 +702,7 @@ if $ARGS[0] = 'trinkets':
 				if katalkinSexDay+7 >= daystart:
 					'Captain Katalkin recognizes you and grins, remembering his recent adventures with you: "You again? Well okay, go on then, run along."'
 
-					act 'Thank him and leave':minut += 1 & gt 'pavtrainhall'
+					act 'Thank him and leave':minut += 1 & gt 'pav_train_hall'
 				elseif katalkinSexDay + 7 < daystart:
 					'Captain Katalkin suddenly recognizes you and frowns: "<<$pcs_nickname>>? You haven''t come to see me in a long time... I thought we had an agreement. Are you avoiding me?"'
 
@@ -731,11 +731,11 @@ if $ARGS[0] = 'trinkets':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 			'You decide to come clean to them, and admit you don''t have the required papers. The policemen do what you expected. They take you to the police station and confiscate all of your money and items, even the money that you didn''t earn by selling souvenirs. You try to object, but they don''t listen and tell you you''re lucky to not end up in jail for this. After two hours and a stern talking-to about the importance of permits, you''re free to go. You feel terrible.'
 
-			act 'Leave the police station':minut += 1 & gt'pavtrainhall'
+			act 'Leave the police station':minut += 1 & gt'pav_train_hall'
 		end
 	end
 end
 
 
---- pavtrainhall_events ---------------------------------
+--- pav_train_hall_events ---------------------------------
 

locations/pavtrain_market.qsrc → locations/pav_train_market.qsrc

@@ -1,10 +1,10 @@
-# pavtrain_market
+# pav_train_market
 
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'pavtrain_market'
-	$menu_loc = 'pavtrain_market'
+	$loc = 'pav_train_market'
+	$menu_loc = 'pav_train_market'
 	$menu_arg = 'start'
 	menu_off = 0
 	CLOSE ALL
@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'This small open air market is located near the train station.'
-	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pavtrain_market', 'start'
+	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pav_train_market', 'start'
 	*nl
 	if hour >= 8 and hour <= 18:
 		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
@@ -39,17 +39,17 @@ if $ARGS[0] = 'start':
 			act 'Reject him':
 				*clr & cla
 				'You pretend not to understand what he is saying, smiling and shaking your head as you move away from him.'
-				act 'Return':gt 'pavtrain_market', 'start'
+				act 'Return':gt 'pav_train_market', 'start'
 			end
 			act 'Go with him':gt 'gevent', '3'
 			
 			exit
 		end
 		
-		act 'Go back to the station': minut += 3 & gt 'pavtrain'
-		act 'Wander through the market': gt 'pavtrain_market','events'
-		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pavtrain_market', 3
-		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pavtrain_market', 4
+		act 'Go back to the station': minut += 3 & gt 'pav_train'
+		act 'Wander through the market': gt 'pav_train_market','events'
+		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pav_train_market', 3
+		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pav_train_market', 4
 
 		if arturKnow = 1 and arturQW = 0:
 			act 'Look for Arthur':gt 'arturRinok', 'start'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			if hour = 16 and minut <= 30:
 				act 'Look for Arthur':gt 'arturRinok', 'work_2'
 			elseif hour < 16:
-				act 'Wait for Arthur to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
+				act 'Wait for Arthur to arrive':hour = 16 & minut = 0 & gt 'pav_train_market', 'start'
 			end
 		end
 
@@ -74,7 +74,7 @@ if $ARGS[0] = 'start':
 				gs'stat'
 				'You stand quietly by the entrance to the market, waiting for customers and displaying your tapestries. Shortly buyers start to gather, but a large, muscular man approaches you and says, "It is illegal to trade in the market without a trader''s license, but I may be interesting in buying your tapestries, 1000 <b>₽</b> apiece. Come and see me at my stall."'
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went and he should be easy to find.'
-				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Leave':gt 'pav_train_market', 'start'
 			end
 		elseif gobelen > 0 and gobQW >= 1:
 			act'Sell ​​tapestry':
@@ -90,14 +90,14 @@ if $ARGS[0] = 'start':
 					minut += 5
 					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Leave':gt 'pav_train_market', 'start'
 				act'Show your tapestry':
 					*clr & cla
 					gobelen -= 1
 					money += 1000
 					gs'stat'
 					'You show your tapestry to Roman and he gives you five hundred for it. You take the money and give him the tapestry.'
-					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Leave':gt 'pav_train_market', 'start'
 				end
 				if gobelen > 1:
 					act'Sell all of your tapestries':
@@ -106,7 +106,7 @@ if $ARGS[0] = 'start':
 						money += gobelen * 1000
 						gobelen = 0
 						gs'stat'
-						act 'Leave':gt 'pavtrain_market', 'start'
+						act 'Leave':gt 'pav_train_market', 'start'
 					end
 				end
 			end
@@ -144,12 +144,12 @@ if $ARGS[0] = 'start':
 						money -= 500
 						ricewine = 1
 						'You hand the woman the money and she gives you the wine.'
-						act 'Leave': gt 'pavtrain_market', 'start'
+						act 'Leave': gt 'pav_train_market', 'start'
 					end
 				else
 					'You are chocked by the high price and realize that you cannot afford the wine. You apologize and turn away.'
 					
-					act 'Leave the market': gt 'pavtrain_market', 'start'
+					act 'Leave the market': gt 'pav_train_market', 'start'
 					
 					act 'Continue browsing the market':
 						*clr & cla
@@ -164,9 +164,9 @@ if $ARGS[0] = 'start':
 						
 						act 'Refuse':
 							'You decline his offer as he upsettingly walks away.'
-							act 'Leave': gt 'pavtrain_market', 'start'
+							act 'Leave': gt 'pav_train_market', 'start'
 						end
-						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
+						act 'Agree': porndeal = 1 & gt 'pav_train_market', 4
 					end
 				end
 			end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'start':
 			end
 			'You look around the market, but the Chinese vendors don''t seem to be here today.'
 			
-			act 'Leave': gt 'pavtrain_market', 'start'
+			act 'Leave': gt 'pav_train_market', 'start'
 		end
 		if porndeal = 1 and ricewine ! 1 and porndealday ! daystart:
 			*clr & cla
@@ -198,10 +198,10 @@ if $ARGS[0] = 'start':
 				ricewine = 1
 				'"Do you have the wine?" you counter.'
 				'He pulls the bottle out of his backpack and you trade items.'
-				act 'Leave': gt 'pavtrain_market', 'start'
+				act 'Leave': gt 'pav_train_market', 'start'
 			else
 				'You tell him that you haven''t had time to pick up the magazine yet but you were working on it.'
-				act 'Leave': gt 'pavtrain_market', 'start'
+				act 'Leave': gt 'pav_train_market', 'start'
 			end 
 		elseif porndeal = 1 and ricewine ! 1 and porndealday = daystart and lookboy = 0:
 			*clr & cla
@@ -210,11 +210,11 @@ if $ARGS[0] = 'start':
 			lookboy = 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
 			'You look around the market for the boy from the Chinese stall, but you can''t find him. You decide to look for him another day.'
-			act 'Leave': gt 'pavtrain_market', 'start'
+			act 'Leave': gt 'pav_train_market', 'start'
 		end
 	else
 		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
-		act 'Go back to the station': minut += 3 & gt 'pavtrain'
+		act 'Go back to the station': minut += 3 & gt 'pav_train'
 	end
 end
 
@@ -227,12 +227,12 @@ if $ARGS[0] = 'events':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/brodit'+rand(1,16)+'.jpg"></center>'
 	'You wander around the market taking in the sounds and colours but nothing catches your eye.'
 	
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	
-	if rand(0,3) = 0: gt 'pavtrain_market', rand(1,19)
+	if rand(0,3) = 0: gt 'pav_train_market', rand(1,19)
 end
 
 if ARGS[0] = 1:
@@ -246,9 +246,9 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the beggar and pretend not to hear him.'
-		act 'Stop wandering': gt 'pavtrain_market', 'start'
+		act 'Stop wandering': gt 'pav_train_market', 'start'
 		if hour >= 8 and hour <= 18:
-			act 'Wander around the market': gt 'pavtrain_market','events'
+			act 'Wander around the market': gt 'pav_train_market','events'
 		end
 	end
 	act 'Give some money': 
@@ -258,9 +258,9 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles which he kindly thanks you for.'
-		act 'Stop wandering': gt 'pavtrain_market', 'start'
+		act 'Stop wandering': gt 'pav_train_market', 'start'
 		if hour >= 8 and hour <= 18:
-			act 'Wander around the market': gt 'pavtrain_market','events'
+			act 'Wander around the market': gt 'pav_train_market','events'
 		end
 	end
 end
@@ -272,9 +272,9 @@ if ARGS[0] = 2:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -289,9 +289,9 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
@@ -302,7 +302,7 @@ if ARGS[0] = 3:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
 			'You bought a fantasy book for 350 <b>₽</b>.'
-			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Leave':gt 'pav_train_market', 'start'
 		end
 	end
 	if money >= 350:
@@ -314,7 +314,7 @@ if ARGS[0] = 3:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
 			'You bought a science ficiton book for 350 <b>₽</b>.'
-			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Leave':gt 'pav_train_market', 'start'
 		end
 	end
 	if money >= 350:
@@ -326,7 +326,7 @@ if ARGS[0] = 3:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
 			'You bought a romance novel for 350 <b>₽</b>.'
-			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Leave':gt 'pav_train_market', 'start'
 		end
 	end
 end
@@ -338,9 +338,9 @@ if ARGS[0] = 4:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
@@ -353,8 +353,8 @@ if ARGS[0] = 4:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 			'You try not to look into the eyes of the porn dealer as you count the money. You quickly grab the cards and shove them in your purse.'
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Buy something else':gt 'pavtrain_market', 4
+			act 'Leave':gt 'pav_train_market', 'start'
+			act 'Buy something else':gt 'pav_train_market', 4
 		end
 	end
 	if porndeal = 1:
@@ -367,8 +367,8 @@ if ARGS[0] = 4:
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 				'You try your best not to look into the eyes of the porn dealer as you count the money. You take the magazine and quickly hide it.'
-				act 'Leave':gt 'pavtrain_market', 'start'
-				act 'Buy something else':gt 'pavtrain_market', 4
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
 	else
@@ -378,24 +378,24 @@ if ARGS[0] = 4:
 			gs 'arousal', 'end'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-			act 'Leave':gt 'pavtrain_market', 'start'
-			act 'Look for something else':gt 'pavtrain_market', 4
+			act 'Leave':gt 'pav_train_market', 'start'
+			act 'Look for something else':gt 'pav_train_market', 4
 			if TimesBuyPorno = 0:
 				'You look over the magazine covers, covered in images of half-naked girls on them. Many of them appear to be near your own age. The porn dealer notices your interest and looks at you expectantly.'
 				act 'Look through a magazine':
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Look for something else':gt 'pavtrain_market', 4
+					act 'Leave':gt 'pav_train_market', 'start'
+					act 'Look for something else':gt 'pav_train_market', 4
 					act 'Ask for the price':
 						*clr & cla
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 						'Blushing profusely right down to your roots, you approach the porn dealer and stammeringly ask him the price on the magazines. The porn dealer smiles at you and says, "All magazines are 400 <b>₽</b> each."'
-						act 'Leave':gt 'pavtrain_market', 'start'
-						act 'Look for something else':gt 'pavtrain_market', 4
+						act 'Leave':gt 'pav_train_market', 'start'
+						act 'Look for something else':gt 'pav_train_market', 4
 						if money >= 400:
 							act 'Buy magazine (400 <b>₽</b>)':
 								*clr & cla
@@ -406,8 +406,8 @@ if ARGS[0] = 4:
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 								'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-								act 'Leave':gt 'pavtrain_market', 'start'
-								act 'Buy something else':gt 'pavtrain_market', 4
+								act 'Leave':gt 'pav_train_market', 'start'
+								act 'Buy something else':gt 'pav_train_market', 4
 							end
 						end
 					end
@@ -418,8 +418,8 @@ if ARGS[0] = 4:
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Look for something else':gt 'pavtrain_market', 4
+					act 'Leave':gt 'pav_train_market', 'start'
+					act 'Look for something else':gt 'pav_train_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
 							*clr & cla
@@ -430,8 +430,8 @@ if ARGS[0] = 4:
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-							act 'Leave':gt 'pavtrain_market', 'start'
-							act 'Buy something else':gt 'pavtrain_market', 4
+							act 'Leave':gt 'pav_train_market', 'start'
+							act 'Buy something else':gt 'pav_train_market', 4
 						end
 					end
 				end
@@ -441,8 +441,8 @@ if ARGS[0] = 4:
 					cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Look for something else':gt 'pavtrain_market', 4
+					act 'Leave':gt 'pav_train_market', 'start'
+					act 'Look for something else':gt 'pav_train_market', 4
 					if money >= 400:
 						act 'Buy magazine (400 <b>₽</b>)':
 							*clr & cla
@@ -453,8 +453,8 @@ if ARGS[0] = 4:
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-							act 'Leave':gt 'pavtrain_market', 'start'
-							act 'Buy something else':gt 'pavtrain_market', 4
+							act 'Leave':gt 'pav_train_market', 'start'
+							act 'Buy something else':gt 'pav_train_market', 4
 						end
 					end
 				end
@@ -466,8 +466,8 @@ if ARGS[0] = 4:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
 		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses without a dildo. "Only 500 <b>₽</b>each."'
-		act 'Leave':gt 'pavtrain_market', 'start'
-		act 'Look for something else':gt 'pavtrain_market', 4
+		act 'Leave':gt 'pav_train_market', 'start'
+		act 'Look for something else':gt 'pav_train_market', 4
 		if money >= 700 and middildo = 0:
 			act 'Buy a 15cm dildo (700 <b>₽</b>)':
 				cla
@@ -482,8 +482,8 @@ if ARGS[0] = 4:
 				else
 					'You buy a dildo and calmly hide it.'
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
-				act 'Buy something else':gt 'pavtrain_market', 4
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
 		if money >= 700 and vibrator = 0:
@@ -499,8 +499,8 @@ if ARGS[0] = 4:
 				else
 					'You buy a vibrator and calmly hide it.'
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
-				act 'Buy something else':gt 'pavtrain_market', 4
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
 		if money >= 700 and analplug = 0:
@@ -518,8 +518,8 @@ if ARGS[0] = 4:
 				else
 					'You buy a butt plug and calmly hide it.'
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
-				act 'Buy something else':gt 'pavtrain_market', 4
+				act 'Leave':gt 'pav_train_market', 'start'
+				act 'Buy something else':gt 'pav_train_market', 4
 			end
 		end
 		if dildo = 1:
@@ -538,8 +538,8 @@ if ARGS[0] = 4:
 					else
 						'You buy a strap-on harness and calmly hide it.'
 					end
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Buy something else':gt 'pavtrain_market', 4
+					act 'Leave':gt 'pav_train_market', 'start'
+					act 'Buy something else':gt 'pav_train_market', 4
 				end
 			end
 		else
@@ -559,8 +559,8 @@ if ARGS[0] = 4:
 					else
 						'You buy a strap-on harness and calmly hide it.'
 					end
-					act 'Leave':gt 'pavtrain_market', 'start'
-					act 'Buy something else':gt 'pavtrain_market', 4
+					act 'Leave':gt 'pav_train_market', 'start'
+					act 'Buy something else':gt 'pav_train_market', 4
 				end
 			end
 		end
@@ -574,9 +574,9 @@ if ARGS[0] = 5:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
 	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -587,7 +587,7 @@ if ARGS[0] = 6:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/nenavizublyadcigan.jpg"></center>'
 	'You meet a Gypsy woman. She offers to tell your fortune.'
-	act 'Decline': gt 'pavtrain_market', 'start'
+	act 'Decline': gt 'pav_train_market', 'start'
 	act 'Accept':
 		*clr & cla
 		minut += 5
@@ -604,7 +604,7 @@ if ARGS[0] = 6:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
 				'You search the area hoping to find the thief, but she has already disappeared into the crowd.'
-				act 'Back': gt 'pavtrain_market', 'start'
+				act 'Back': gt 'pav_train_market', 'start'
 			end
 		end
 	end
@@ -618,16 +618,16 @@ if ARGS[0] = 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
 		act 'Buy the cosmetics (800 <b>₽</b>)':
 			minut += 15
 			money -= tovpay
 			kosmetica += 50
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	end
 end
@@ -640,16 +640,16 @@ if ARGS[0] = 8:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
 		act 'Buy vitamins (105 <b>₽</b>)':
 			minut += 15
 			vitamin += 20
 			money -= tovpay
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	end
 end
@@ -662,9 +662,9 @@ if ARGS[0] = 9:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/condoms.jpg"></center>'
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
 		act 'Buy condoms (80 <b>₽</b>)':
@@ -676,7 +676,7 @@ if ARGS[0] = 9:
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	end
 end
@@ -689,9 +689,9 @@ if ARGS[0] = 10:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
 		act 'Buy lip balm (100 <b>₽</b>)':
@@ -699,7 +699,7 @@ if ARGS[0] = 10:
 			minut += 15
 			lipbalm += 30
 			money -= tovpay
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	end
 end
@@ -726,9 +726,9 @@ if ARGS[0] = 12:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if pcs_energy <= 80:
 		act 'Buy a pie for 20 <b>₽</b>':
@@ -744,7 +744,7 @@ if ARGS[0] = 12:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/eat.jpg"></center>'
 			'The pie is still warm as the woman hands it over to you. Barely able to keep yourself away from it, you find a place to sit down and enjoy the pie.'
-			act 'Continue walking through the market': gt 'pavtrain_market','events'
+			act 'Continue walking through the market': gt 'pav_train_market','events'
 		end
 	else
 		*p ', But you are not hungry right now.'
@@ -764,7 +764,7 @@ if ARGS[0] = 13:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vernutwallet.jpg"></center>'
 		'You call to the woman and hold out her wallet. She looks at you and releasing she gratefully takes her wallet back and walks away.'
-		act 'Continue walking through the market': gt 'pavtrain_market','events'
+		act 'Continue walking through the market': gt 'pav_train_market','events'
 	end
 	act 'Look through the purse':
 		*clr & cla
@@ -785,7 +785,7 @@ if ARGS[0] = 13:
 				gs 'stat'
 				'You just need the money.'
 				
-				act 'Continue': gt 'pavtrain_market','start'
+				act 'Continue': gt 'pav_train_market','start'
 			end
 		else
 			act 'Take the money and throw away the wallet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -796,9 +796,9 @@ if ARGS[0] = 13:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
-			act 'Stop wandering': gt 'pavtrain_market', 'start'
+			act 'Stop wandering': gt 'pav_train_market', 'start'
 			if hour >= 8 and hour <= 18:
-				act 'Wander around the market': gt 'pavtrain_market','events'
+				act 'Wander around the market': gt 'pav_train_market','events'
 			end
 		end
 	end
@@ -811,9 +811,9 @@ if ARGS[0] = 14:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -824,9 +824,9 @@ if ARGS[0] = 15:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -837,9 +837,9 @@ if ARGS[0] = 16:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
 	'Looking around, you almost collide with a man pulling a small cart.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -850,9 +850,9 @@ if ARGS[0] = 17:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
 	'You wander past a the meet seller and see a butcher working with an axe.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 end
 
@@ -863,9 +863,9 @@ if ARGS[0] = 18:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	gs 'willpower', 'voyeur', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
@@ -876,7 +876,7 @@ if ARGS[0] = 18:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pereodev'+rand(1,15)+'.jpg"></center>'
 			'You look inside the tent and see ' + $pavtrain_marketrandtext[rand(3,7)]
-			act 'Leave': gt 'pavtrain_market', 'start'
+			act 'Leave': gt 'pav_train_market', 'start'
 		end
 	else
 		act 'Look through the hole (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -891,9 +891,9 @@ if ARGS[0] = 19:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/birthcontrolpills.jpg"></center>'
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
-	act 'Stop wandering': gt 'pavtrain_market', 'start'
+	act 'Stop wandering': gt 'pav_train_market', 'start'
 	if hour >= 8 and hour <= 18:
-		act 'Wander around the market': gt 'pavtrain_market','events'
+		act 'Wander around the market': gt 'pav_train_market','events'
 	end
 	if money >= tovpay:
 		act 'Buy birth control pills (1500 <b>₽</b>)':
@@ -918,10 +918,10 @@ if ARGS[0] = 19:
 				end
 			end
 			money -= tovpay
-			gt 'pavtrain_market', 'start'
+			gt 'pav_train_market', 'start'
 		end
 	end
 end
 
---- pavtrain_market ---------------------------------
+--- pav_train_market ---------------------------------
 

locations/road.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = '':
 	end
 	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 20:
-		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pavtrain'
+		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train'
 		act 'Walk to Pavlovsk commercial area (0:15)': minut += 15 & gt 'pav_commercial'
 	end
 	if nroad < 20:act 'Walk towards Pavlovsk (0:20)':minut += 20 & nroad += 1 & gt $curloc

locations/succubus.qsrc

@@ -778,23 +778,23 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 1: $sucgoloc = 'pav_commercial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'pav_residential' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'gskver' & $sucgometka = 'start'
-			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pav_train' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'gLake' & $sucgometka = ''
 		elseif sucslpzone = 3:
 			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'city_park' & $sucgometka = 'start'
 			if sctemp = 3: $sucgoloc = 'pav_commercial' & $sucgometka = ''
-			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pav_train' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'motel' & $sucgometka = ''
 		elseif sucslpzone = 4:
 			if sctemp = 1: $sucgoloc = 'liam' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'liames' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'parks' & $sucgometka = ''
-			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pav_train' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'city_industrial' & $sucgometka = ''
 		elseif sucslpzone = 5:
 			if sctemp = 1: $sucgoloc = 'gadukino' & $sucgometka = ''
-			if sctemp = 2: $sucgoloc = 'pavtrain' & $sucgometka = ''
+			if sctemp = 2: $sucgoloc = 'pav_train' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'motel' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'city_park' & $sucgometka = 'start'

locations/train.qsrc

@@ -85,9 +85,9 @@ end
 
 if $ARGS[0] = 'communal_centre':
 	minut += 15
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$metka = 'inside'
-	$menu_loc = 'cityTrain'
+	$menu_loc = 'city_train'
 	$menu_arg = 'communal_centre'
 	menu_off = 0
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
@@ -97,12 +97,12 @@ if $ARGS[0] = 'communal_centre':
 	'After 15 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'
+		gt 'city_train', 'inside'
 	end
 end
 
 if $ARGS[0] = 'communal_ind':
-	$loc = 'nordtrain'
+	$loc = 'city_industrial_train'
 	$metka = 'platform'
 	minut += 10
 	menu_off = 1
@@ -112,7 +112,7 @@ if $ARGS[0] = 'communal_ind':
 	'After 10 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'
+		gt 'city_industrial_train', 'platform'
 	end
 end
 
@@ -132,7 +132,7 @@ if $ARGS[0] = 'communal_village':
 end
 
 if $ARGS[0] = 'communal_pavlovsk':
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'platform'
 	minut += 25
 	menu_off = 1
@@ -141,7 +141,7 @@ if $ARGS[0] = 'communal_pavlovsk':
 	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': gt 'pavtrainhall', 'platform'
+	act 'Get off the train': gt 'pav_train_hall', 'platform'
 end
 
 if $ARGS[0] = 'village':
@@ -236,7 +236,7 @@ if $ARGS[0] = 'village_trains':
 end
 
 if $ARGS[0] = 'village_centre':
-	$loc = 'cityTrain'
+	$loc = 'city_train'
 	$metka = 'inside'
 	menu_off = 1
 	minut += 25
@@ -247,12 +247,12 @@ if $ARGS[0] = 'village_centre':
 	'After 25 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'
+		gt 'city_train', 'inside'
 	end
 end
 
 if $ARGS[0] = 'village_ind':
-	$loc = 'nordtrain'
+	$loc = 'city_industrial_train'
 	$metka = 'platform'
 	menu_off = 1
 	minut += 20
@@ -263,7 +263,7 @@ if $ARGS[0] = 'village_ind':
 	'After 20 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'
+		gt 'city_industrial_train', 'platform'
 	end
 end
 
@@ -283,7 +283,7 @@ if $ARGS[0] = 'village_communal':
 end
 
 if $ARGS[0] = 'village_pavlovsk':
-	$loc = 'pavtrainhall'
+	$loc = 'pav_train_hall'
 	$metka = 'platform'
 	minut += 15
 	menu_off = 1
@@ -294,7 +294,7 @@ if $ARGS[0] = 'village_pavlovsk':
 	'After 15 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'
+		gt 'pav_train_hall', 'platform'
 	end
 end
 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'weed':
 					'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 					act 'Get off the train':
 						if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-						gt 'cityTrain', 'inside'
+						gt 'city_train', 'inside'
 					end
 				end
 			end
@@ -393,7 +393,7 @@ if $ARGS[0] = 'weed':
 						'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 						act 'Get off the train':
 							if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-							gt 'cityTrain', 'inside'
+							gt 'city_train', 'inside'
 						end
 					end
 				end		

locations/trainBimbo.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'pos1':
 		end
 	end
 	act 'Wait for men':gt 'trainbimbo', 'pos1'
-	act 'Leave':gt 'pavtrainhall', 'male'
+	act 'Leave':gt 'pav_train_hall', 'male'
 end
 
 if $ARGS[0] = 'pos2':
@@ -58,7 +58,7 @@ if $ARGS[0] = 'pos2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo2.jpg"></center>'
 	'An unfamiliar man blushed and went into a stall.'
 	act 'Follow him into the stall.':gt 'trainbimbo', 'pos22'
-	act 'Leave':gt 'pavtrainhall', 'male'
+	act 'Leave':gt 'pav_train_hall', 'male'
 end
 
 if $ARGS[0] = 'pos22':
@@ -134,7 +134,7 @@ if $ARGS[0] = 'pos22':
 		act 'Leave the stall.':gt 'trainbimbo', 'pos1'
 	end
 
-	act 'Leave':gt 'pavtrainhall', 'male'
+	act 'Leave':gt 'pav_train_hall', 'male'
 end
 
 
@@ -152,7 +152,7 @@ if $ARGS[0] = 'pos3':
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees'+rand(0,6)+'.jpg"></center>'
 	'You get down on your knees and open your mouth to suck his cock.'
 		act'Suck':gt'trainbimbo','pos33'
-		act 'Run out of the bathroom.':gt'pavtrainhall'
+		act 'Run out of the bathroom.':gt'pav_train_hall'
 	end
 end
 
@@ -263,7 +263,7 @@ if $ARGS[0] = 'pos4':
 	'You pretend not to notice anything. Maybe they will just think you are so stupid, that you mixed up the women''s room with the mens room.'
 
 	act 'Wait':gt 'trainbimbo', 'pos1'
-	act 'Leave':gt 'pavtrainhall', 'male'
+	act 'Leave':gt 'pav_train_hall', 'male'
 end
 
 if $ARGS[0] = 'pos5':
@@ -275,7 +275,7 @@ if $ARGS[0] = 'pos5':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo1.jpg"></center>'
 	'You ran into a toilet stall and closed the door. You feel shame at the thought of anyone catching you in here. Your heart was pounding in your chest.'
 
-	act 'Run out of toilet':gt 'pavtrainhall', 'male'
+	act 'Run out of toilet':gt 'pav_train_hall', 'male'
 end
 
 if $ARGS[0] = 'pos6':
@@ -293,7 +293,7 @@ if $ARGS[0] = 'pos6':
 		'You strip out of your clothes.'
 		act 'Further':gt'trainbimbo','pos66'
 	end
-	act 'Ran out of toilet':gt'pavtrainhall'
+	act 'Ran out of toilet':gt'pav_train_hall'
 end
 
 if $ARGS[0] = 'pos66':