Synch with main.

glife.qproj

@@ -555,11 +555,11 @@
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
 	</Folder>
-	<Folder name="Town">
-		<Location name="pavResidential"/>
-		<Location name="pavCommercial"/>
-		<Location name="pavCommercialOffices"/>
-		<Location name="pavIndustrial"/>
+	<Folder name="Pavlovsk">
+		<Location name="pav_residential"/>
+		<Location name="pav_commercial"/>
+		<Location name="pav_commercial_offices"/>
+		<Location name="pav_industrial"/>
 		<Location name="leonid"/>
 		<Location name="gargazel"/>
 		<Location name="garfather"/>
@@ -645,7 +645,8 @@
 	</Folder>
 	<Folder name="Community center">
 		<Location name="pav_commcenter"/>
-		<Location name="pav_commclubs"/>		
+		<Location name="pav_commclubs"/>
+		<Location name="pav_library"/>
 		<Location name="gdkin"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>

locations/AlbFatherQW.qsrc

@@ -15,7 +15,7 @@ $din_zajava_albfather = {
 			gs 'stat'
 			'You wrote and signed your statement to the captain. He then let you go without a fuss.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }
@@ -37,7 +37,7 @@ $din_zajava_albfather_no2 = {
 			gs 'stat'
 			'You quickly dialed Albina''s number. In a harried tone you told her of the events that had just transpired. There was a short pause and Albina thanked you and hung up.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }

locations/AlbStarsEnd.qsrc

@@ -10,7 +10,7 @@ Chernov = 10
 gs 'stat'
 'You walk down the street and see Albina Barlovskuyu. Near her, a van stops; people emerge from the vehicle running towards her. They restrain her face to the ground, hands behind her back before putting her in handcuffs. Albina is furious, but her face suddenly pales when she sees the warrant for her arrest and hears the accusations of running a brothel. After a thorough search she is put on her feet, shoved into a police car and whisked away.'
 
-act 'Leave':gt 'pavResidential'
+act 'Leave':gt 'pav_residential'
 
 --- AlbStarsEnd ---------------------------------
 

locations/AleksandraHome.qsrc

@@ -34,14 +34,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks of books with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually, <<$npc_nickname[''A231'']>> starts to get a little annoyed at you, but continues on, none the less, with her suggestions.'
 	act 'Continue looking':
@@ -137,14 +137,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually <<$npc_nickname[''A231'']>> starts to get a little annoyed, but continues on none the less with her suggestions.'
 	act 'Continue looking':

locations/Cheatmenu_din.qsrc

@@ -2430,7 +2430,7 @@ $cheatmenu = {
 	'Jump forward <a href="exec:dynamic $cheatmenu[''quicktime''], 15 & dynamic $cheatmenu">+15</a> minutes'
 	*nl
 	*nl
-	'<a href="exec:gt''pavResidential''">Teleport to Pavlovsk</a>'
+	'<a href="exec:gt''pav_residential''">Teleport to Pavlovsk</a>'
 	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'

locations/FedorEv.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/fedor.jpg"></center>'
 
-			act 'Leave the school courtyard':gt 'pavResidential'
+			act 'Leave the school courtyard':gt 'pav_residential'
 		end
 	end
 end

locations/FedorEv2.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'Train Tracks':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Walk home with Fedor': gt 'pavResidential'	
+		act 'Walk home with Fedor': gt 'pav_residential'	
 	end	
 	act 'Offer him your hand':
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'Train Tracks':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/nokiss.jpg"></center>'
 		'You think to yourself "This is going too fast." so you offer Fedor your hand. He is a little surprised at first but kisses your hand nonetheless. Fedor lowers your hand as he releases it and after a few moments of silence you notice a Fedor''s posture lowers as he turns away from you "It''s starting to get late, we should probally get going before your parents start to worry about you." He says, with a meek smile as he takes your hand and walks you home.'
 			
-		act 'Walk home with Fedor': gt 'pavResidential'
+		act 'Walk home with Fedor': gt 'pav_residential'
 	end	
 end	
 
@@ -703,7 +703,7 @@ if $ARGS[0] = 'Skate Kiss':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Skate End':	
@@ -717,7 +717,7 @@ if $ARGS[0] = 'Skate End':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Cafe':	
@@ -767,7 +767,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Take his hand':	
 				*clr & cla
@@ -784,7 +784,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end	
 		act 'Get on the swing with Fedor':	
@@ -807,7 +807,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Hug Fedor':	
 				*clr & cla
@@ -820,7 +820,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end			
 		end	
 	end
@@ -849,7 +849,7 @@ if $ARGS[0] = 'Park 2':
 
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end
 		end
 	end	
@@ -872,7 +872,7 @@ if $ARGS[0] = 'Park 2':
 			
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		act 'Relax':	
 			*clr & cla
@@ -884,7 +884,7 @@ if $ARGS[0] = 'Park 2':
 
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		gs 'willpower', 'bj', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -922,7 +922,7 @@ if $ARGS[0] = 'Park 2':
 						
 						act 'Take me home': gt 'FedorEv2', 'Park End'
 						
-						act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+						act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 					end
 					act 'Stop before he cums':	
 						*clr & cla
@@ -935,7 +935,7 @@ if $ARGS[0] = 'Park 2':
 						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 						
-						act 'Leave':minut += 15 & gt 'pavResidential'
+						act 'Leave':minut += 15 & gt 'pav_residential'
 					end						
 				end	
 			end
@@ -970,7 +970,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -981,7 +981,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end		
 		act 'Lay down between the tracks':	
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end					
 	end		
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'Fedor Breakup':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'Fedor approaches you with a serious look on his face. "Look <<$pcs_firstname>>, I''ve noticed that you and I don''t seem to be progressing at all in this relationship and I feel like I would only be holding you back if I continued this, so I think we should break this off...I''m sorry that I couldn''t be the man you needed." and before you get to say a word he turns around and leaves.'
 	
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end		
 
 --- FedorEv2 ---------------------------------

locations/FedorEv3.qsrc

@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'Movies 3':
 	*nl	
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></video></center>'
 
-	act 'Walk away':gt 'pavResidential'
+	act 'Walk away':gt 'pav_residential'
 end		
 
 --- FedorEv3 ---------------------------------

locations/FedorEv4.qsrc

@@ -2724,7 +2724,7 @@ if $ARGS[0] = 'Hallway':
 		else
 			FedorHomeDate = 0
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 	
@@ -3620,7 +3620,7 @@ if $ARGS[0] = 'Dimka Aftermath':
 			gt 'FedorEv4', 'Bedroom'
 		else
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -3634,7 +3634,7 @@ if $ARGS[0] = 'Home Entrance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
-	act 'Walk away': minut += 5 & gt 'pavResidential'
+	act 'Walk away': minut += 5 & gt 'pav_residential'
 	act 'Knock on the door':gt 'FedorEv4', 'Home Entrance 2'
 end
 
@@ -3657,7 +3657,7 @@ if $ARGS[0] = 'Home Entrance 2':
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
 		'You knock on the door but no one answers.'
-		act 'Walk away': minut += 5 & gt 'pavResidential'
+		act 'Walk away': minut += 5 & gt 'pav_residential'
 	end
 end
 

locations/FedorMisc.qsrc

@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 
 							act 'Get dressed then leave':
 								gs 'clothing', 'wear_last_worn'
-								gt 'pavResidential'
+								gt 'pav_residential'
 							end
 						end
 					end
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'Dimka Party':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/fedor.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Dimka Party 2':
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'Dimka Party 2':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/outcast.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'VKwip':

locations/Gnpc2.qsrc

@@ -19,14 +19,14 @@ $din_gboy_end_to_disco = {
 
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offers to accompany you home.'
 
-			act 'go home':gt 'pavResidential'
+			act 'go home':gt 'pav_residential'
 		end
 	elseif gnpcSex[numnpc] > 0:
 		'<<$boydesc>> invites you to his home.'
@@ -34,7 +34,7 @@ $din_gboy_end_to_disco = {
 
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -88,11 +88,11 @@ $din_gboy_go_to_disco = {
 
 							if tiprand <= 70:
 								'Fortunately, <<$boydesc>> manages to win the fight verbally, accusing the Gopnik of grabbing you, his girlfriend. But the evening was spoiled and finally <<$boydesc>> suggests that it would be better if you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							elseif tiprand <= 85:
 								otnBoyFrend[numnpc] -= 20
 								'The Gopnik quickly pounces on your guy and punches him in the face. It seems that <<$boydesc>> doesn''t stand a chance against the three Gopniks and before he gets completely beaten up he offers all his money to the angry Gopniks and apologizes repeatedly before all of them. You quickly leave the dance floor and <<$boydesc>> suggests that you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							else
 								'The discussion escalates quickly into a fight and soon the Gopniks charge at your <<$bfTitle[numnpc]>> in the middle of the club.'
 								*nl
@@ -113,7 +113,7 @@ $din_gboy_go_to_disco = {
 											'You try to push the Gopnik, but someone pushes you roughly away from the fight.'
 											*pl $stumble
 											*pl $bfDiscoBadEnd
-											act 'Go home':gt 'pavResidential'
+											act 'Go home':gt 'pav_residential'
 										else
 											'You push back the Gopnik with all your strength and he stumbles backwards, hitting his head on the floor. But the second Gopnik turns to you and swings his fist towards your face.'
 											if pcs_agil < 60:
@@ -123,7 +123,7 @@ $din_gboy_go_to_disco = {
 												gs 'stat'
 												*pl $looseTooth
 												*pl $bfDiscoBadEnd
-												act 'Go home':gt 'pavResidential'
+												act 'Go home':gt 'pav_residential'
 											else
 												'You react just in time and quickly move your head to the side barely avoiding his punch.'
 												*nl
@@ -144,7 +144,7 @@ $din_gboy_go_to_disco = {
 														'You swing at the Gopnik and hit him right on the nose. He staggers briefly and then yells angrily at you, "Oh, you bitch!". He charges quickly at you and then a barrage of punches comes raining down on you.'
 														$looseTooth
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													else
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
@@ -152,7 +152,7 @@ $din_gboy_go_to_disco = {
 														'You try to hit the hooligan with a punch to the face but your blow is too slow. The Gopnik dodges your weak attempt and pushes you roughly away.'
 														$stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -170,7 +170,7 @@ $din_gboy_go_to_disco = {
 															*pl $discoScratch1
 															*pl $discoScratch2
 															*pl $discoScratch3
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														'You try to kick the hooligan in his face but he is faster than you and manages to shove you away before you even got your leg up.'
@@ -179,7 +179,7 @@ $din_gboy_go_to_disco = {
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
 														gs 'stat'
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -201,7 +201,7 @@ $din_gboy_go_to_disco = {
 																*pl $discoScratch1
 																*pl $discoScratch2
 																*pl $discoScratch3
-																act 'Go home':gt 'pavResidential'
+																act 'Go home':gt 'pav_residential'
 															end
 														else
 															pcs_mood -= 20
@@ -210,7 +210,7 @@ $din_gboy_go_to_disco = {
 															*pl $badKick
 															*pl $stumble
 															*pl $bfDiscoBadEnd
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														pcs_mood -= 20
@@ -219,7 +219,7 @@ $din_gboy_go_to_disco = {
 														*pl $badKick
 														*pl $stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 											end
@@ -235,7 +235,7 @@ $din_gboy_go_to_disco = {
 									gs 'stat'
 									'<<$boydesc>> can''t escape the attacks of the three Gopniks and soon falls under a barrage of punches. The Gopniks drag him into the streets where they steal all his money, take off his shoes, and throw him into the bushes.'
 									'Once they left, you help your <<$bfTitle[numnpc]>> to his feet and manage to get him back home. His face is covered in blood and bruises everywhere.'
-									act 'Go home':gt 'pavResidential'
+									act 'Go home':gt 'pav_residential'
 								end
 							end
 						end
@@ -808,7 +808,7 @@ $din_gboy_tits = {
 					gs 'stat'
 					'You take his hand out of your pants, and he shakes his head, not understanding.'
 
-					act 'Go home':gt 'pavResidential'
+					act 'Go home':gt 'pav_residential'
 				end
 			else
 				act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -834,7 +834,7 @@ $din_gboy_tits = {
 						'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 						'You pull his hard and hot cock out of his pants and wrap your hand around it. You start kissing him while stroking his penis. Finally the guy groans and you watch as loads of his sperm erupt again and again from his cock.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Jerk him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -866,7 +866,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
 						gs 'dinsex','bj_swallow_random'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Remove it from your mouth':
@@ -879,7 +879,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 						'You remove his member from your mouth just as a stream of hot sperm hits you in the face, then another and another until he eventually finished coating your face with his cum.'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Surrender':
@@ -898,7 +898,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'boy_puts_condom'
 						gs 'dinsex','vaginal_sex',10
 						gs 'dinsex','sexcum'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -919,7 +919,7 @@ $din_gboy_tits = {
 							gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -948,7 +948,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'You pull his hand from your pussy, and he just looks at you, slightly confused.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -978,7 +978,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'vaginal_sex', 15
 						gs 'dinsex', 'sexcum'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -998,7 +998,7 @@ $din_gboy_tits = {
 							gs 'dinSex', 'boy_wants_anal','lubri' & gs 'dinsex', 'analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1020,7 +1020,7 @@ $din_gboy_tits = {
 			gs 'stat'
 			'You remove his hands from your exposed breasts, and he looks puzzled, not sure why.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1052,7 +1052,7 @@ $din_gboy_knee = {
 			gs 'stat'
 			'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1076,7 +1076,7 @@ $din_gboy_knee = {
 				gs 'stat'
 				'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-				act 'Go home':gt 'pavResidential'
+				act 'Go home':gt 'pav_residential'
 			end
 		else
 			act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1143,7 +1143,7 @@ $din_gboy_go_to_boyhome = {
 							otnBoyFrend[numnpc] -= 20
 							gs 'stat'
 							'You got up from the couch upset with the guy claiming that you are not interested in watching that type of trash. <<$boydesc>> gets embarrassed and blushing began stuttering an apology.'
-							act 'Go home':gt 'pavResidential'
+							act 'Go home':gt 'pav_residential'
 						end
 					else
 						act 'Refuse to watch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1165,7 +1165,7 @@ $din_gboy_go_to_boyhome = {
 								gs 'stat'
 								'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							end
 						else
 							act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1187,7 +1187,7 @@ $din_gboy_go_to_boyhome = {
 								act 'Kiss him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-						act 'Go home': gt 'pavResidential'
+						act 'Go home': gt 'pav_residential'
 					end
 				end
 			end
@@ -1201,7 +1201,7 @@ $din_gboy_go_to_boyhome = {
 			dynamic $din_gboy_knee
 		end
 
-		!!act 'Go home':gt 'pavResidential'
+		!!act 'Go home':gt 'pav_residential'
 	end
 }
 
@@ -1216,7 +1216,7 @@ gs 'stat'
 if hour < 20:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		gdeystboyrand = rand(0, 1)
 
@@ -1225,20 +1225,20 @@ if hour < 20:
 			dynamic $din_gboy_go_to_boyhome
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to take you home.'
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'<<$boydesc>> suggested that you two go to his home.'
 		dynamic $din_gboy_go_to_boyhome
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1246,7 +1246,7 @@ if hour < 20:
 elseif hour >= 20 and hour < 23:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		tipgbrand = rand(0, 1)
 
@@ -1255,14 +1255,14 @@ elseif hour >= 20 and hour < 23:
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif tipgbrand = 1:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		gdeystboyrand = rand(0, 1)
@@ -1270,13 +1270,13 @@ elseif hour >= 20 and hour < 23:
 		if gdeystboyrand = 0:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to go to the disco.'
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1286,7 +1286,7 @@ elseif hour >= 20 and hour < 23:
 elseif hour >= 23:
 	'<<$boydesc>> offered to take you home.'
 
-	act 'go home':gt 'pavResidential'
+	act 'go home':gt 'pav_residential'
 end
 
 --- Gnpc2 ---------------------------------

locations/JuliaMilHome.qsrc

@@ -1,7 +1,7 @@
 # JuliaMilHome
 
 $location_type = 'indoors'
-$menu_loc = 'pavCommercial'
+$menu_loc = 'pav_commercial'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL

locations/KatjaHome.qsrc

@@ -15,7 +15,7 @@ else
 	if hour >= 9:'The door is opened by Katja''s mother. "Oh, hello <<$pcs_nickname>>. Katja isn''t home right now."'
 	if hour < 9:'The door is opened by Katja''s mother. "<<$pcs_nickname>>. Shouldn''t you be in bed? You shouldn''t come around before nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- KatjaHome ---------------------------------

locations/KatjaHomeTalk.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -263,7 +263,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -288,7 +288,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -334,7 +334,7 @@ if $ARGS[0] = '':
 	if mey_vika['key'] = 1:
 		Act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 	end
 end
 

locations/LBZhouse.qsrc

@@ -96,7 +96,7 @@ $LBZH_end={
 			act 'Leave':
 				gs 'arousal', 'end'
 				gs 'stat'
-				gt'pavResidential'
+				gt'pav_residential'
 			end
 		end
 	end

locations/LariskaHome.qsrc

@@ -49,13 +49,13 @@ else
 		'"Yes, I''m <<$pcs_nickname>>." you reply tearing your eyes away from her nearly exposed breasts.'
 		'"Ah, <<$pcs_nickname>>, Lariska has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately. I am glad that she has such a good friend! She needed someone to get her back on her feet. <<$text_home>>"'
 		lariskaMotherKnown = 1
-		act 'Go back to town':gt'pavResidential'
+		act 'Go back to town':gt'pav_residential'
 		exit
 	end
 	if hour >= 9:'Lariska''s mother opens the door. "Hello, <<$pcs_nickname>>. I''m sorry, but Lariska isn''t home."'
 	if hour < 9:'Lariska''s mother opens the door. "Good morning , <<$pcs_nickname>>. I''m sorry but Lariska is still in bed. She doesn''t get up before nine."'
 
-	act 'Return to town':gt'pavResidential'
+	act 'Return to town':gt'pav_residential'
 end
 
 if $ARGS[0] = 'in':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'in':
 		cla
 		'Lariska looks at her watch and says, "It''s time to go to the sports club."'
 		act 'Go with Lariska':lariskaTrain += 1 & minut += 20 & gt 'gdksport', 'start'
-		act 'Say goodbye and go home':gt'pavResidential'
+		act 'Say goodbye and go home':gt'pav_residential'
 		exit
 	end
 	act 'Ask for a drink':
@@ -170,7 +170,7 @@ if $ARGS[0] = 'in':
 		end
 	end
 
-	act 'Say goodbye and go home':gt'pavResidential'
+	act 'Say goodbye and go home':gt'pav_residential'
 end
 
 --- LariskaHome ---------------------------------

locations/LariskaStart.qsrc

@@ -441,7 +441,7 @@ if $ARGS[0] = 'end':
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/fight/start_end.jpg"></center>'
 												'You wake up covered in semen and with a bottle sticking out of your pussy. Your entire body is covered with obscene graffiti. Your whole body hurts, and your holes feel like glowing rods were shoved in all night.'
 
-												act 'Leave':gt'pavResidential'
+												act 'Leave':gt'pav_residential'
 											end
 										end
 									end
@@ -453,7 +453,7 @@ if $ARGS[0] = 'end':
 			end
 		end
 
-		act 'Leave':gt'pavResidential'
+		act 'Leave':gt'pav_residential'
 	end
 end
 

locations/MeynoldHome.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 

locations/NikoDates.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'Home 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend the rest of the time discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko gives you a hug. "You are an amazing girl <<$pcs_firstname>>, I will await anxiously for our next meeting. Take care m''lady." Niko gives you a kiss on the forehead before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Home Sad':
@@ -318,7 +318,7 @@ if $ARGS[0] = 'Home Sad':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend a few minutes discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko turns to you and says, "I hope you enjoyed yourself today. Hopefully next time we could do something more interesting." Niko gives you a kiss on the hand before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Date 2':
@@ -557,7 +557,7 @@ if $ARGS[0] = 'Date Rape':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'							
 							'Niko kisses your leg, "You were a bit wild, it was a side of you that I haven''t seen before and I liked it." You reply, "Really? well I guess I could try cutting loose a bit more often." Niko pats your ass gently as he replies, "Now that''s what I like to hear! So would you like some cereal? I have plenty downstairs." You shake your head, "No I need head back home, but thanks for the offer." You give Niko a kiss on the cheek before walking out the room, where Niko guides you out of the door.'
 
-							act 'Walk to the residential district':minut += 5 & gt 'pavResidential'
+							act 'Walk to the residential district':minut += 5 & gt 'pav_residential'
 						end
 					end	
 				end	
@@ -946,7 +946,7 @@ if $ARGS[0] = 'Yurik Intro':
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 							'Niko''s eyes light up as he begins kissing your hands even faster before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-							act 'Walk away':gt 'pavResidential'
+							act 'Walk away':gt 'pav_residential'
 						end
 
 						act 'I don''t believe you':
@@ -964,7 +964,7 @@ if $ARGS[0] = 'Yurik Intro':
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 								'Niko''s eyes light up as he grabs onto then begins kissing your hands before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-								act 'Walk away':gt 'pavResidential'
+								act 'Walk away':gt 'pav_residential'
 							end
 
 							act 'No, I don''t believe you <font color=#FF00FF>[Break up with Niko]</font>':
@@ -1002,7 +1002,7 @@ if $ARGS[0] = 'Yurik Intro':
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised1.jpg"></center>'
 											'Niko remains silent as he rubs his face. Yurik turns to you then says, "Get out of here girl. Niko and I have a debt to discuss." Yurik then pushes you out of the room before slamming the door closed behind you. You quickly leave the house without looking back.'
 
-											act 'Leave house':minut += 5 & gt 'pavResidential'
+											act 'Leave house':minut += 5 & gt 'pav_residential'
 										end
 									end	
 								end	
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'After School':
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 										'Niko kneels down in front of you then removes the collar from your neck before kissing your lips passionately for a few seconds then gently rubbing your cheek. "You will always be my perfect little princess. I have an important test to take tomorrow, so I will be very busy, but feel free to stop by the <font color=#c600ff>disco</font> and we can have a good time." Niko then stands up and walks away.'
 										
-										act 'Stand up':gt 'pavResidential'
+										act 'Stand up':gt 'pav_residential'
 									end
 								end	
 							end	

locations/NikoEv2.qsrc

@@ -232,7 +232,7 @@ if $ARGS[0] =  'Niko Wake':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/home/bedroom/relaxing1.jpg"></center>'
 		'After relaxing for a few minutes, You get up then stretch your body before saying, "I should head home. It is getting late." Niko places his hand on your shoulder. "Will you be alright on your own?" You reply, "Of course. I''ll see you tomorrow." You lean forward and kiss Niko on the cheek before getting up, getting dressed then leaving Niko''s house.'			
 
-		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pavResidential'
+		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pav_residential'
 	end
 end
 

locations/NikoMeyHome.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 

locations/ParChurch.qsrc

@@ -30,8 +30,8 @@ if $ARGS[0] = 'start':
 	'Vigil is held Saturdays at 19h.'
 	'The Divine Liturgy is on Sundays between 9h and 12h.'
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'ParChurch', 'vigil'
@@ -41,8 +41,8 @@ if $ARGS[0] = 'start':
 		if Churchbad = 3 and Churchbadtime > daystart:
 			cla & nl
 			'The priest is probably still mad at you. You decide to avoid him for now.'
-			act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-			act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+			act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+			act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 		elseif Churchbad = 3 and Churchbadtime <= daystart:
 			Churchbad = 2
 			*nl
@@ -140,29 +140,29 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod and say, "I''d love to stay but I... need to get back to clinic. I am doing volunteer work there." Your mother approvingly nods her head before saying. "You''re volunteering at the clinic? I''m very proud of you. Go on, I''ll see you back at home." You wave to your mother as you walk away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 1:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod then say, "I need to get back to the clinic." I just came to pick someone up." Your <<$npc_nickname[''A29'']>> nods then says with a sad tone. "Okay, I was just hoping that you could stay for a bit, but I won''t stop you from doing gods work." You return the nod before walking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 2:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You give your <<$npc_nickname[''A29'']>> a nod then say, "I would stay bu..." you mother finishes your sentence, "You need to get back to the clinic, I understand." She then waves at you while looking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 3:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod before your mother asks you, "Can you not stay for at least a little bit? God blesses his devout children." you lower your posture before replying, "I know he does but, I really need to go. I will see you at home." your <<$npc_nickname[''A29'']>> sighs as she turns away and says, "I''ll see you at home."'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 4:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -170,8 +170,8 @@ if $ARGS[0] = 'Excuses':
 		'You mother firmly guides you out the door to the side of the church then angrily says, "<<$pcs_nickname>> I went to the clinic the other day to ask if you could have time off and the receptionist told me that you haven''t been working there at all. YOU HAVE BEEN LYING TO ME IN THE LORDS HOUSE OF ALL PLACES!!! If you don''t want to stay with me or pay respect to our creator then at least be honest about it. Telling lies is what sinners do when they are too afraid to face their problems."'
 		*nl
 		'You lower your head as your mother continues, "I''m going to go back in there and do my part as a child of Christ. You can go back to whatever you were planning on doing. I won''t force you to stay." She then shakes her head at you before walking back into the church. You take a few seconds to collect yourself as you feel tears rolling down your face. You never realized that you were crying. You then walk away feeling like you really screwed up.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 5:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -185,8 +185,8 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost11.jpg"></center>'
 		'You turn to walk out of the church and see your mother sigh, as she turns back toward the front.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	end
 end
 
@@ -368,8 +368,8 @@ if $ARGS[0] = 'Leave Early':
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	'You approach your <<$npc_nickname[''A29'']>> and say, "I had a great time but I should be heading home now." Your <<$npc_nickname[''A29'']>> replies, "Alright thank you for stopping by and you learned something about yourself today." She then lightly rubs your arm before going back to praying.'
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] =  'Leave':
@@ -404,8 +404,8 @@ if $ARGS[0] =  'Leave':
 		'As the church ceremonies ends, you and your <<$npc_nickname[''A29'']>> get up and collect your things before walking out of the church. Your <<$npc_nickname[''A29'']>> says, "I had a great time today. I always enjoy spending time with my loving daughter. Hopefully I''l see you here again next week." She then kisses your cheek then hands you 300 <b>₽</b> before walking away.'
 	end
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'candle':

locations/ParkKafe.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'guys':
 					'One guy lies down and roughly pulls you on top. He groans in pleasure when his hard member rubs against your tight pussy, then he starts fucking your pussy relentlessly. The other guy lines up behind you and shoves his penis up your ass. You moan, both in pain and pleasure, at the sensation of being filled in both holes.'
 					'One of them finishes deep inside you while the other pulls out and cums on your ass.'
 					gs 'arousal', 'anal', 5
-					gs 'arousal', 'vaginal', -5,
+					gs 'arousal', 'vaginal', -5
 					gs 'cum_call', '', $boy
 					gs 'cum_call', 'anus', $boy
 					gs 'arousal', 'end'

locations/abduction.qsrc

@@ -565,7 +565,7 @@ if $ARGS[0] = 'abdEscapeWindow3':
 
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'city_industrial'
-	act 'Run right':gt 'pavCommercial'
+	act 'Run right':gt 'pav_commercial'
 	act 'Run forward':gt 'city_lake', 'start'
 end
 

locations/albinahome.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	if hour >= 20 and week >= 5 and week < 7:
 		'Albina says that she wants to go to the disco.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 	elseif hour < 20 and npc_sex['A23'] = 0:
 		'Albina smiles at you affably and says, "<<$pcs_firstname>> I have a bottle of fine wine here, let''s drink."'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 										'"I should really get going, I''m sorry, I wish I could help." Albina nods her head in understanding. "I will see you later ok?" You tell her.'
 										'She smiles. "Of course, <<$pcs_nickname>>." Then you get up and leave her house.'
 
-										act 'Continue':gt 'pavResidential'
+										act 'Continue':gt 'pav_residential'
 									end
 								else
 									act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'start':
 												minut -= 30
 												gs 'stat'
 
-												act 'Say goodbye and go home':gt 'pavResidential'
+												act 'Say goodbye and go home':gt 'pav_residential'
 											end
 										end
 									end
@@ -205,7 +205,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about video games': gt 'albinahome', 'game'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'stripping':
 		'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 		'Albina recommends that you start with learning to dance.'
 	end
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Rest':gt 'albinahome', 'start'
 end
 
@@ -266,7 +266,7 @@ if $ARGS[0] = 'poledancing':
 		'Albina taught you various acrobatic moves on the pole.'
 		if pcs_dancpol >= 100: 'You could not learn anything new, you already know everything she could teach you.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
 		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'poledancing':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
 			act 'Rest':gt 'albinahome', 'start'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 		end
 	else
 		minut += 120
@@ -302,7 +302,7 @@ if $ARGS[0] = 'poledancing':
 			'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 			'Albina recommends that you start with learning to dance.'
 		end
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	end
 end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'dressing':
 		'You and Albina open her huge wardrobe and begin digging into her various dresses.'
 		'As you rummage around in her wardrobe, you are amazed by how many different clothes she can fit in there. It feels like her wardrobe is a bottomless pit filled with dresses, leggings, jeans, and all kinds of other clothes!'
 		'You end up spending an hour trying on various dresses with Albina.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Chat some': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 	end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'chat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You chat with Albina about school, love interest, family, makeup up, even the latest tv shows or movies you have watched.'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Keep chatting':
 		*clr & cla
 		menu_off = 1
@@ -362,7 +362,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head no. "Not right now, thanks. I was just noticed all of them is all, maybe some other time."'
 		'She shrugs. "Sure if you ever want to, all you have to do is ask."'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
 	end
@@ -394,14 +394,14 @@ if $ARGS[0] = 'game':
 					'You shake your head no. "Not this time, maybe next time.."'
 					'You can tell she is a little disappointed, but then turns her attention to the game instead. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 					'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-					act 'Say goodbye and go home':gt 'pavResidential'
+					act 'Say goodbye and go home':gt 'pav_residential'
 				end
 			else
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'You and Albina lay down in front of a huge flat screen TV, after picking one of the games. The two of you play as you chat about varies things and trash talk, though neither one of you is giving your full attention to the game, instead you are just having fun together.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Keep playing video games': gt 'albinahome', 'playgame'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'playgame':
 				'You shake your head no. "Uh that''s ok. I really am not interested in that."'
 				'Albina puts the strapon away, but you can tell she is a little disappointed. Then she comes back over and lays down beside you again. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 				'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-				act 'Say goodbye and go home':gt 'pavResidential'
+				act 'Say goodbye and go home':gt 'pav_residential'
 			end
 		else
 			act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -454,7 +454,7 @@ if $ARGS[0] = 'playgame':
 		act 'Keep playing video games': gt 'albinahome', 'playgame'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 	end
 end
 
@@ -648,7 +648,7 @@ if $ARGS[0] = 'strapon_finish':
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 

locations/albinaporog.qsrc

@@ -11,7 +11,7 @@ else
 	if hour >= 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate. You say that you''re here to visit Albina. He shakes his head and says, "Albina is currently not at home."'
 	if hour < 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate, saying "Come no earlier than nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- albinaporog ---------------------------------

locations/arturHome.qsrc

@@ -36,7 +36,7 @@ act 'Go to his home':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				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 @@ act 'Go to his home':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		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/arturend.qsrc

@@ -43,7 +43,7 @@ act 'Brush up':
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'
 	end
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 end
 
 --- arturend ---------------------------------

locations/bank.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 		if bankloc = 1:
 			gt 'city_center'
 		else
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		end
 	end
 	
@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 				if bankloc = 1:
 					gt 'city_center'
 				else
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				end
 			end
 		end

locations/barbershop.qsrc

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

locations/belpicknick.qsrc

@@ -515,7 +515,7 @@ if $ARGS[0] = 'end':
 	if rand(1,100) <= 70:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are, "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsk, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'
-		act'Return to Pavlovsk':gt 'pavCommercial'
+		act'Return to Pavlovsk':gt 'pav_commercial'
 	else
 		minut += 10
 		'Siple looks at your face in disgust. "That looks fucking disgusting... there''s no way you''re getting in our car. Find your own way home, slut!"'

locations/boilerroom.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/qwest/alter/boiler/boilerroom'+ rand(1,3) +'.jpg"></center>'
 	'This event is still not completed. Please bug Ekay until he gets it done.'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 --- boilerroom ---------------------------------

locations/brother_voyeur.qsrc

@@ -1720,7 +1720,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 		
 		act'Fuck him till he cums':gt'brother_voyeur','shower_creampie'
 			
-		act'Fill me up!':'brother_voyeur','shower_fill_me_up'
+		act'Fill me up!':gt 'brother_voyeur','shower_fill_me_up'
 		
 	elseif brothercumchoice = 3:
 		'"<<$pcs_nickname>>-! I''m almost there! Let me cum on your face!"'

locations/budgetclothes.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 			minut += 3
 			gt 'torgcentr'
 		else
-			gt 'pavIndustrial'
+			gt 'pav_industrial'
 		end
 	end
 	

locations/carF.qsrc

@@ -16,13 +16,13 @@ $enddrive = {
 	if cardrive = 14:gt 'liam'
 	if cardrive = 18:gt 'youplace'
 	if cardrive = 19:gt 'nordtrain', 'outside'
-	if cardrive = 20:gt 'pavResidential'
+	if cardrive = 20:gt 'pav_residential'
 	if cardrive = 21:gt 'zaprF','start'
 	if cardrive = 22:gt 'road'
 	if cardrive = 23:gt 'gadukino'
-	if cardrive = 24:gt 'pavCommercial'
+	if cardrive = 24:gt 'pav_commercial'
 	if cardrive = 25:gt 'city_island'
-	if cardrive = 26:gt 'pavIndustrial'
+	if cardrive = 26:gt 'pav_industrial'
 }
 
 if $ARGS[0] = 'start':

locations/casino.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'roulette_result':
 
 	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/resul.jpg"></right>'
 	*nl
-	'The ball stopps at <<x_rul>> <<$color>>'
+	'The ball stops at <<x_rul>> <<$color>>'
 
 	if kh ! 0:
 		if kh = 1:

locations/dateF.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy woman that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy, but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Thanks, I think..." you answer thinking she''s pretty cute while squirming.'
 					'"Okay, I''ll tell you but you must promise me one thing." you tease her.'
 					'Staying quiet for a moment, <<$boydesc>> is contemplating what she should answer, finally deciding, "Sure, whatever you want, I can''t say no to a girl in a hot school outfit..."'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give her a contemptuous look. "Oh, you have me all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Well, I spotted you while I was on my way to a friend''s place and your looks caught my attention. Simply said, I want to add another trophy to my trophy wall." she impudently answers.'
 					'You snap and get up in her face, "How about I cut off your tits and add them to my collection."'
 					'She starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my tits just where they are, but if you wanted to fondle them..." She says with a grin. "But seriously, I just wanted to ask you out, so how about it?'

locations/dateM.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy guy, that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Thanks, I think..." you answer thinking he''s pretty cute while squirming.'
 					'"Okay, I''ll tell you but you must promise me one thing." you tease him.'
 					'Staying quiet for a moment, <<$boydesc>> is contemplating what he should answer, finally deciding, "Sure, whatever you want, I can''t say to a girl in a hot school outfit..."'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give him a contemptuous look. "Oh, you have us all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Well, I spotted you while I was on my way to a friends place and your looks caught my attention. Simply said, I want to add another trophy to my trophy wall." he impudently answers.'
 					'You snap and get up in his face, "How about I cut off your balls and add them to my collection."'
 					'He starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my balls just where they are, but if you wanted to fondle them..." He says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
@@ -271,7 +271,7 @@ if $args[0] = 'date_choice':
 		!!if good weather, day/night, go to park is an option
 		act '"Let''s go to the park."':gt 'dateM', 'datepark'
 	end
-	if $loc = 'pavResidential' or $loc = 'pavCommercial' or $loc = 'city_center':
+	if $loc = 'pav_residential' or $loc = 'pav_commercial' or $loc = 'city_center':
 		!!if in pav or city center this is an option
 		act '"Let''s go to the movie theater."':gt 'dateM', 'datecinema'
 	end

locations/dimaEv.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'after_school':
 				*nl
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 			elseif dimaFilm = 0:
 				'Dimka says, "Yes, I had her in the bushes near the community center, she sucked my dick and swallowed my cum like a total pro."'
 				'Fedor scowls, rage flashing in his face. Then walks right up to Dimka. "What did you just say punk?"'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'cleanup':
 	end
 	'You are shocked. Once he sees that you understand he adds: "If you don''t do as I say and come by here once a week to see to my needs, I will make sure everyone in school and your house gets this video."'
 	'At his threat, your blood runs cold and you go pale, you know what this would mean to your reputation, not counting how your mother would react.'
-	act 'Run out of his house': gt 'pavResidential'
+	act 'Run out of his house': gt 'pav_residential'
 	act 'Plead': gt 'dimaEv', 'plead'
 end
 
@@ -279,7 +279,7 @@ if $ARGS[0] = 'plead':
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 	'<center><img src="images/pc/tears1.jpg"></center>'
 	'You start begging and pleading him not to do this and to give you the video. But laughter is all the confirmation you need that, no matter what you say he won''t give it to you. Tears begin to spill from your eyes, as you realize you''re trapped and powerless, a plaything for him, as long as that video exists. Not knowing what else to do, you gather your stuff and run out of his house, his laughter echoes in your ears.'
-	act 'Run out of his house': gt 'pavResidential'
+	act 'Run out of his house': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'blackmail':
@@ -345,7 +345,7 @@ if $ARGS[0] = 'dimkawarns':
 		gs 'pain', 2, 'vaginal', 'tear'
 		gs 'pain', 1, 'eyes', 'burn'
 		gs 'stat'
-		act 'Leave':gt 'pavResidential'
+		act 'Leave':gt 'pav_residential'
 	end
 end
 
@@ -406,7 +406,7 @@ if $ARGS[0] = 'dimkaabuse0':
 			gs 'arousal', 'end'
 			gs 'pain', 2, 'throat', 'stretch'
 			gs 'stat'
-			act 'Leave':gt 'pavResidential'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end
@@ -424,7 +424,7 @@ if $ARGS[0] = 'dimkaabuse1':
 	gs 'arousal', 'end'
 	gs 'pain', 2, 'throat', 'stretch'
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse2':
@@ -442,7 +442,7 @@ if $ARGS[0] = 'dimkaabuse2':
 	'Ignoring foreplay, Dimka push his <<dick>>cm <<$dick_girth>> cock through your vaginal lips. Pain from the rape, bondage, forced position and, especially, the humiliation make you cry. "Peee." That stupid sound is the only thing that you can make. Dimka seems to enjoy it, and his laughs are probably the worst. "Peee". He tries to fuck you hard, but the wheel makes you drive away. Eventually he forces you against the wall pounding himself balls deep into your pussy, instead of moaning, you make funny clown sounds."Peee."'
 	gs 'dinsex','sexcum'
 	'At last he bends over you, nailing the steering wheel with his weight on your back. Pain rises all over your body. He is cumming. Then, slowly, Dimka get up, and without a word go to take a shower. You are left crying and sore. It takes a while to slowly undo all the stupid set, all the time sobbing in a corner of the room. Once Dimka end showering he walk over to you "What the fuck are you doing here".'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse3':
@@ -456,7 +456,7 @@ if $ARGS[0] = 'dimkaabuse3':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/car.jpg"></center>'
 	'Dimka binds and ties your knees with a pair of little carts, tie you up with rope, attach a steering wheel to your back, covers your face in blue clown makeup and finally, puts a clown horn in your mouth and tapes it in place. "You know. I have been asking my father for a car. He says no. That I must wait until eighteen. So..I will comfort with you." Smilling, he put himself in position to shove his dick.'
 	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse4':
@@ -473,7 +473,7 @@ if $ARGS[0] = 'dimkaabuse4':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/nar.jpg"></center>'
 	'Dimka ties your hands tightly behind your back, then ties your legs so that they are fully folder under you. He puts a collar on you and drags you to a post where a dildo has been taped in place. Dimka makes you take the dildo in your mouth, then he ties the collar to the post so that you can not get the dildo out of your mouth. Just when you think Dimka has finished with you, he pulls the rope on your collar forcing the dildo down your throat. Dimka begins to enjoy the sight of your face reddened by suffocation, while streams of snot, saliva and tears run down your face. You choke with the dildo in your throat and you can feel that your body keeps trying to vomit. You start to fear that this is how you will die, choked with a dildo down your throat. As you start to lose consciousness, Dimka finally frees you and you are able to finally breathe freely.'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse5':
@@ -486,7 +486,7 @@ if $ARGS[0] = 'dimkaabuse5':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/spank.jpg"></center>'
 	'Dimka ties you to a pole. Then he shows you a leather whip. "You know slut. I am really am understanding individual. And what I think you need, is a little of discipline. So.. Let see if I can help you." He begins to whip your ass. "One." Sharp flashes of pain burn through your drug induced euphoria and you begin screaming. "Two." You beg Dimka to stop. "Three." You sob and fight against the bonds. "Four." You understand that this is only the beginning. After several more, Dimka is satisfied and releases you.'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse6':
@@ -508,7 +508,7 @@ if $ARGS[0] = 'dimkaabuse6':
 		'When he finally gets bored, Dimka pierces your nipples with metal bars, then sets you free.'
 	end
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse7':
@@ -527,7 +527,7 @@ if $ARGS[0] = 'dimkaabuse7':
 		'When he gets bored of watching you in pain, Dimka pulls the needles, pierces your tongue with a metal bar, then sets you free'
 		pierCount += 1
 	end
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse8':
@@ -546,7 +546,7 @@ if $ARGS[0] = 'dimkaabuse8':
 		'When he gets bored of watching you in pain, Dimka takes the pins out of your pussy, pierces your clitoris, then sets you free'
 		pierCount += 1
 	end
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse9':
@@ -565,7 +565,7 @@ if $ARGS[0] = 'dimkaabuse9':
 	gs 'arousal', 'bj', 15, 'humiliation', 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse10':
@@ -593,7 +593,7 @@ if $ARGS[0] = 'dimkaabuse10':
 			gs 'arousal', 'bj', 5, 'sub', 'humiliation', 'deepthroat', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gt 'pavResidential'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end

locations/dimaHome.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'home':
 !!On Fridays after 19 the mother won''t answer the door.
 		elseif (hour >= 8 and hour < 14) or (week ! 5 and hour >= 19 and hour < 24):
 			'A few moments later Dimka''s mother answers the door. "I''m sorry, Dimka isn''t home right now. But I will let him know you stopped by to see him." With a smile she closes the door.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		else
 			'After knocking several times, no one answers. It seems that either no one is home, or everyone is asleep.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		end
 	else
 !!20% chance that mother answers saying he isn''t home. Just to show Dimka does other stuff.
@@ -28,10 +28,10 @@ if $ARGS[0] = 'home':
 !!On Fridays after 19 the mother won''t answer the door.
 		elseif (hour >= 8 and hour < 14) or (week ! 5 and hour >= 19 and hour < 24):
 			'A few moments later Dimka''s mother answers the door "I''m sorry, Dimka isn''t home right now. But I will let him know you stopped by to see him." With a smile she closes the door.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		else
 			'After knocking several times, no one answers. It seems that either no one is home, or everyone is asleep.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		end
 	end
 end
@@ -47,7 +47,7 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/hallway.jpg"></center>'
 	'You walk into the entrance hall of Dimka''s house, noticing that it is tastefully decorated. There is a small closet for your coat with a set of shelves and a mirror. This room leads to all other areas of the house.'
-	act '<b>Leave Dimka''s home</b>': gt 'pavResidential'
+	act '<b>Leave Dimka''s home</b>': gt 'pav_residential'
 	act 'Living Room': gt 'dimaHome','livingroom'
 	act 'Kitchen': gt 'dimaHome','kitchen'
 	act 'Bathroom': gt 'dimaHome','bathroom'
@@ -799,7 +799,7 @@ if $ARGS[0] = 'dimka_chat':
 								'<center><img src="images/pc/no.jpg"></center>'
 								'You shake your head again. "No thanks."'
 								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-								act 'Leave Dimka''s home': gt 'pavResidential'
+								act 'Leave Dimka''s home': gt 'pav_residential'
 							end
 						else
 							act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -820,7 +820,7 @@ if $ARGS[0] = 'dimka_chat':
 									'<center><img src="images/pc/no.jpg"></center>'
 									'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-									act 'Leave Dimka''s home': gt 'pavResidential'
+									act 'Leave Dimka''s home': gt 'pav_residential'
 								end
 							else
 								act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -886,7 +886,7 @@ if $ARGS[0] = 'dimka_chat':
 									'<center><img src="images/pc/no.jpg"></center>'
 									'You shake your head again. "No thanks."'
 									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-									act 'Leave Dimka''s home': gt 'pavResidential'
+									act 'Leave Dimka''s home': gt 'pav_residential'
 								end
 							else
 								act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'dimka_chat':
 										'<center><img src="images/pc/no.jpg"></center>'
 										'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 										'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-										act 'Leave Dimka''s home': gt 'pavResidential'
+										act 'Leave Dimka''s home': gt 'pav_residential'
 									end
 								else
 									act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -965,7 +965,7 @@ if $ARGS[0] = 'dimka_chat':
 						'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 						'You shake your head no and push his hand away. "I doubt that, he makes me happy."'
 						'Dimka gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "You know what? I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-						act 'Leave Dimka''s home': gt 'pavResidential'
+						act 'Leave Dimka''s home': gt 'pav_residential'
 					end
 				else
 					act 'No I don''t thnk I can (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -988,7 +988,7 @@ if $ARGS[0] = 'dimka_chat':
 							'<center><img src="images/pc/no.jpg"></center>'
 							'You shake your head no. "No thanks."'
 							'He gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
+							act 'Leave Dimka''s home': gt 'pav_residential'
 						end
 					else
 						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'dimka_chat':
 								'<center><img src="images/pc/no.jpg"></center>'
 								'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-								act 'Leave Dimka''s home': gt 'pavResidential'
+								act 'Leave Dimka''s home': gt 'pav_residential'
 							end
 						else
 							act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'dimka_chat':
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 							'You push him away with all your strength and finally force him to back up. "I said no."'
 							'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
+							act 'Leave Dimka''s home': gt 'pav_residential'
 						end
 					else
 						act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'dimka_makeout':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'With that he reaches back in and tries to pull your top off again, You push him away with all your strength and you barely manage to force him to back up. "I said no."'
 					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'I said no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1145,7 +1145,7 @@ if $ARGS[0] = 'dimka_seduce':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'You push him away with all your strength and finally manage to force him to back up. "I said no."'
 					'Dimka''s face suddenly turns into anger and confusion, obviously upset. "I thought you liked me, but whatever! I think you should leave." With that he gets up and escorts you to his bedroom door and closes it firmly behind you. Unsure what else to do you leave his house.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'dimka_makeout2':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'With that, he reaches back in and tries to pull your top off again, You push him away with all your strength and finally manage to force him to back up. "I said no."'
 					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'I said no(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1289,7 +1289,7 @@ if $ARGS[0] = 'dimka_knees':
 								*nl
 								'An evil grin plays across his face. "I''m glad you asked." Dimka says picks up a remote before turning on the tv. As soon as the screen turns on you see webcam video of him fucking you. Your face drains to pale white as you realize he''s just recorded you having sex with him. Just as the shock is setting he makes his play, "If you don''t do everything I say and come by here at least once a week to service me, I will make sure everyone in school gets a copy of this video. Oh, and your parents as well, just for good measure, whore."'
 								'Your blood runs cold as the threat sinks in. You know what this would mean to your reputation, at school and at home with you mother.'
-								act 'Run out of his house': gt 'pavResidential'
+								act 'Run out of his house': gt 'pav_residential'
 								act 'Plead':
 									*clr & cla
 									minut += 5
@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'dimka_knees':
 									'<center><img src="images/pc/tears1.jpg"></center>'
 									'"Please, you can''t do this to me! Please delete it." You beg and plead with him, hoping to undo this mistake.'
 									'Dimka laughs in your face. "I don''t think so, slut. You''re going to be my cock sock from now on, or else everyone will learn just how loose your dirty cunt really is." Tears begin to spill from your eyes as you realize you''re trapped and powerless, destined to be a plaything for this monster as long as that video exists. Not knowing what else to do you mournfully gather your stuff and run out of his house, his laughter echoing in your ears as the tears stain your face.'
-									act 'Run out of his house': gt 'pavResidential'
+									act 'Run out of his house': gt 'pav_residential'
 								end
 							end
 						end

locations/dimaRevenge.qsrc

@@ -912,7 +912,7 @@ if dimaRevChoice = 4:
 							'As you wake up, you see a partially dressed Anushka sitting on the window sill smoking a cigarette. Alyona is still sleeping like a baby. "She looks so content," Anushaka says in a somewhat sad tone, which makes you wonder just how rough Alyona''s life is, "and so adorable when she''s like this. Are you going home?"'
 							'"Yeah," you say as you get dressed. "I''ll see you later."'
 							'You give her a kiss, then finish getting dressed and head home. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
-							act 'Continue': gt 'pavResidential'
+							act 'Continue': gt 'pav_residential'
 						end
 					end
 				else
@@ -920,7 +920,7 @@ if dimaRevChoice = 4:
 						*clr & cla
 						'<center><img src="images/locations/pavlosvk/school/oldshcool/gopnahngout/party/party.jpg"></center>'
 						'You watch the two of them make out and then they drift into another room to be alone. You rejoin the party, talking with others and drinking. You spend the whole day there, even passing out for awhile, only to wake up to several others also passed out. Seems like the party finally ran out of steam. You get up and look around a bit, stretching before heading out. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
-						act 'Continue': gt 'pavResidential'
+						act 'Continue': gt 'pav_residential'
 					end
 				end
 			end

locations/dimalina.qsrc

@@ -246,12 +246,12 @@ if $ARGS[0] = 'watch':
 					minut += rand(30,60)
 					gs 'stat'
 					!!need to reset dimbadgirl to 0 after this so it starts over for each args scene set.
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				else
 					'After that, Dimka opens the closet and you look up at him to see him smiling down at you.'
 					'"Well, it looks like you''re not a complete dumb slut, but don''t get confused: you''re still just as worthless." He yanks the gag out and tugs you free from the chains. "Come on, get dressed and leave, I''m done with you for today. I''m only human, I can''t be bothered to fuck you now."'
 					'You groan and stand up on unstable legs. Your body hurts and you''re still in a lustful haze.'
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				end
 			end
 		end
@@ -403,7 +403,7 @@ if $ARGS[0] = 'cums1':
 		if pcs_health > 20: pcs_health -= 20
 		gs 'arousal', 'voyeur_sex', 5, 'bound'
 		gs 'stat'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 
@@ -513,7 +513,7 @@ if $ARGS[0] = 'linadefiled':
 		if pcs_health > 20: pcs_health -= 20
 		npc_rel['A1'] += 1
 		gs 'stat'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 
@@ -647,7 +647,7 @@ if $ARGS[0] = 'dimkalina6':
 				'You look at him with a blank expression. Why is he so excited?'
 				'"Well <<$pcs_nickname>>, time is running short and I must do something. You may go now."'
 				'Not wanting to miss your chance, you proceed to leave his room. With one last glance back at him, you see he stands in the middle of the room smiling and looking to the closet. As you close the door of his room, you swear that you hear the noise of chains.'
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -866,7 +866,7 @@ if $ARGS[0] = 'hooksex':
 	if pcs_health > 20: pcs_health -= 20
 	minut += rand(20,30)
 	gs 'stat'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'helplina':
@@ -941,7 +941,7 @@ if $ARGS[0] = 'walklina':
 		'She looks at you a moment, and shrugs.'
 		'"Do whatever you want, <<$pcs_firstname>>.'
 		'Then she begins to walk towards her home.'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 	act 'Accompany her':
 		*clr & cla
@@ -957,7 +957,7 @@ if $ARGS[0] = 'walklina':
 			'She cries and then turns, running with all her strength and leaving you far behind.'
 			if pcs_mood > 10: pcs_mood -= 10
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		elseif npc_rel['A19'] < 50:
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up to her, she stops and gives you a questioning gaze.'
 			'"Let''s go home Lina."'
@@ -971,7 +971,7 @@ if $ARGS[0] = 'walklina':
 			npc_rel['A19'] += 3
 			minut += 5
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		else
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up with her, she stops and gives you a questioning gaze.'
 			'"Let''s go home, Lina," You say to her.'
@@ -986,7 +986,7 @@ if $ARGS[0] = 'walklina':
 				'"Ok, this is my stop."'
 				'Lina leaves your side and looks at you with a half smile.'
 				'"Thanks, <<$pcs_nickname>>... I... Well I needed that."'
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'escape':
 	npc_rel['A1'] -= 40
 	minut += rand(10,30)
 	gs 'stat'
-	act 'leave': gt 'pavResidential'
+	act 'leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'succubusdimka':
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'succubusdimka':
 			scfeed = succublvl + rand(1,4)
 			minut += rand(20,30)
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		end
 	end
 end

locations/din_npc.qsrc

@@ -7,7 +7,7 @@
 
 $go_home = {
 		if curr_home = 1:
-		gt 'pavResidential'
+		gt 'pav_residential'
 		elseif curr_home = 2:
 		gt 'gadukino'
 		elseif curr_home = 3:

locations/dina.qsrc

@@ -13,7 +13,7 @@ $brodila = {
 
 $brodilr = {
 	if StoryLine = 1 and home_owned[2] = 1:
-		gt 'pavResidential'
+		gt 'pav_residential'
 	elseif home_owned[4] = 1:
 		gt'liames'
 	else

locations/dom_gor.qsrc

@@ -179,7 +179,7 @@ act 'Go out onto the street':
 		'<b><font color="red">You feel too ill to travel through the streets.</font></b>'
 		xgt $curloc
 	else
-		xgt 'pavCommercial'
+		xgt 'pav_commercial'
 	end
 
 end

locations/ender.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'win':
 
 		act 'Go home':
 			if curr_home = 1:
-				gt 'pavResidential'
+				gt 'pav_residential'
 			elseif curr_home = 2:
 				gt 'gadukino'
 			elseif curr_home = 3:

locations/etoexhib.qsrc

@@ -597,7 +597,7 @@ if $ARGS[0] = 'pos17':
 		act 'Enter':money -= 25 & minut += 15 & gt 'etoexhib', 'pos18'
 	end
 
-	act 'Go back to the train station':gt 'pavCommercial'
+	act 'Go back to the train station':gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'pos18':
@@ -813,7 +813,7 @@ if $ARGS[0] = 'pos20':
 
 	if teachlevel > 0 and teachlevel < 10:workPTU = 2
 
-	act 'Leave':minut += 15 & gt 'pavCommercial'
+	act 'Leave':minut += 15 & gt 'pav_commercial'
 	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
 end
 
@@ -1431,7 +1431,7 @@ if $ARGS[0] = 'pos40':
 	if gor_dorm = 2:act 'Search for the superintendant':gt 'comendant', 'pos3'
 	if gor_dorm >= 3:act 'Inspect the barn':gt 'etoexhib', 'pos43'
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'pos41':

locations/fbDormD.qsrc

@@ -236,7 +236,7 @@ $d_fbd_end = {
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave':gt 'pavResidential'
+		act 'Leave':gt 'pav_residential'
 	end
 }
 

locations/fbHouse.qsrc

@@ -78,7 +78,7 @@ act 'Kiss him':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 			end
 		end
 	end

locations/furisex.qsrc

@@ -53,7 +53,7 @@ elseif furisex = 6:
 	gs 'stat'
 	
 	furisex = 0
-	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pavCommercial'
+	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pav_commercial'
 	if nroad ! 10: act 'Have him drop you off in Gadukino': gt 'gadukino'
 	if nroad ! 0: act 'Have him drop you off in St. Petersburg': gt 'nord'
 elseif furisex = 100:
@@ -136,7 +136,7 @@ elseif furisex = 101:
 	gs 'stat'
 	
 	furisex = 0
-	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pavCommercial'
+	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pav_commercial'
 	if nroad ! 10: act 'Have him drop you off in Gadukino': gt 'gadukino'
 	if nroad ! 0: act 'Have him drop you off in St. Petersburg': gt 'nord'
 end

locations/gdkkru.qsrc

@@ -1,84 +0,0 @@
-# pav_commclubs
-
-$metka = ''
-$loc = 'pav_commclubs'
-$menu_loc = 'pav_commclubs'
-$menu_arg = ''
-menu_off = 0
-$location_type = 'public_indoors'
-
-frost = 0
-gs 'stat'
-
-gs 'themes', 'indoors'
-
-'<center><b><font color = maroon>The community center</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gdkkru.jpg"></center>'
-
-
-act 'Leave': gt 'pav_commcenter'
-
-act 'Go to the toilets': gt 'gdktoilet', 'start'
-
-if nerd_game['game_day'] = daystart and hour = 20: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
-
-if hour >= 12 and hour < 20:
-	'At this time of day the community center operates various clubs.'
-
-	if krumonth = month and kruyear = year:
-		act 'Go to the sewing club': gt 'krupo'
-	else
-		act 'Go to the sewing club':
-			cls
-			menu_off = 1
-			gs 'stat'
-			'<center><b><font color = maroon>Sewing circle</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
-			'You went to the sewing club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
-			if money >= 500:
-				act 'Sign up':
-					cls
-					money -= 500
-					krumonth = month
-					kruyear = year
-					gs 'stat'
-					'You pay the tuition.'
-					act 'Leave': gt 'pav_commclubs'
-				end
-			end
-
-			act 'Leave': gt 'pav_commclubs'
-		end
-	end
-     
-	if chessmonth = month and chessyear = year:
-		act 'Go to the chess club': gt 'kruchess'
-	else
-		act 'Go to the chess club':
-			cls
-			menu_off = 1
-			gs 'stat'
-			'<center><b><font color = maroon>Chess Circle</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/kruchess.jpg"></center>'
-			'You went to the chess club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
-			if money >= 500:
-				act 'Sign up':
-					cls
-					money -= 500
-					chessmonth = month
-					chessyear = year
-					gs'stat'
-					'You pay the tuition.'
-					act 'Leave': gt 'pav_commclubs'
-				end
-			end
-
-			act 'Leave': gt 'pav_commclubs'
-		end
-	end
-else
-	'Club''s closed.'
-end
-
---- pav_commclubs ---------------------------------
-

locations/gdksport.qsrc

@@ -570,7 +570,7 @@ if $ARGS[0] = 'starlets':
 									gs 'stat'
 									'You got in the car along with the rest of the troupe, and shortly you returned to town.'
 
-									act 'Leave': gt 'pavResidential'
+									act 'Leave': gt 'pav_residential'
 								end
 							else
 								act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'starlets':
 					gs 'stat'
 					'You got in the car along with the rest of the troupe, and shortly you returned to town.'
 
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				end
 			end
 		end
@@ -626,7 +626,7 @@ if $ARGS[0] = 'cab_home':
 		'Along the way you wiped the sperm from your face.'
 	end
 
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'racing2':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'Fedor First Date':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/walk.jpg"></center>'
 				'"Sure, I would love to go out with you." you replied. Fedor was visibly delighted "Alright I look forward to hanging out with you again. Whenever you are up for another date then meet me in the school yard, after school." Fedor says as he walks you back home. The two of you have fun discussing your favorite movies as you continue your way home.'
 
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 			act 'Refuse':
 				*clr & cla
@@ -1308,7 +1308,7 @@ if $ARGS[0] = 'Fedor First Date':
 					'You say to Fedor "You seem like a cool guy but I''m just not ready for a relationship right now." Fedor was visibly upset as he replies, "I guess it wasn''t a good time, if you ever change your mind then pay me a visit at school." he says with a forced smile as he silently walks you home.'
 				end
 
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -1320,7 +1320,7 @@ if $ARGS[0] = 'Fedor First Date':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 		'You said to Fedor "I have too much that I need to do right now... maybe some other time." Fedor then lowered his head with a frown. "Okay. Maybe some other time."'
 
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 

locations/gdktoilet.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 		CLOSE ALL
 	end
 
-	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'gdkbibl'
+	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'pav_library'
 	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
 	if hour >= 14 and hour <= 20: act 'Go to the gym': gt 'gdksport', 'start'
 end

locations/gdktoilet_womens.qsrc

@@ -636,7 +636,7 @@ if $ARGS[0] = 'rape':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You run from the community center and don''t stop until you are back in the residential area'
-		act 'Catch your breath': minut += 5 & gt 'pavResidential'
+		act 'Catch your breath': minut += 5 & gt 'pav_residential'
 	end
 end
 

locations/gevent.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = '3':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Continue':gt 'pavResidential'
+	act 'Continue':gt 'pav_residential'
 end
 
 if $ARGS[0] = '4':
@@ -187,7 +187,7 @@ if $ARGS[0] = '4':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Return to Pavlovsk':gt 'pavResidential'
+	act 'Return to Pavlovsk':gt 'pav_residential'
 end
 
 if $ARGS[0] = '5':
@@ -235,7 +235,7 @@ if $ARGS[0] = '5':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Straighten your clothes':gt 'pavResidential'
+	act 'Straighten your clothes':gt 'pav_residential'
 end
 
 if $ARGS[0] = '6':
@@ -292,7 +292,7 @@ if $ARGS[0] = '6':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Return to the Pavlovsk streets':gt 'pavResidential'
+	act 'Return to the Pavlovsk streets':gt 'pav_residential'
 end
 
 if $ARGS[0] = '7':
@@ -326,7 +326,7 @@ if $ARGS[0] = '7':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Return to the Pavlovsk streets':gt 'pavResidential'
+	act 'Return to the Pavlovsk streets':gt 'pav_residential'
 end
 
 --- gevent ---------------------------------

locations/glake.qsrc

@@ -78,7 +78,7 @@ act'Return to Pavlovsk':
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
 		minut += 5
-		gt'pavResidential'
+		gt'pav_residential'
 	else
 		'You need to wear some clothes. It''s not decent to walk the streets naked.'
 		act'Return':gt'glake'

locations/gopnik_house.qsrc

@@ -61,7 +61,7 @@ elseif gophouse = 1:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		
 	else
 		act 'Open your eyes':
@@ -78,7 +78,7 @@ elseif gophouse = 1:
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		end  	
 	end
 end

locations/gopnik_initiation.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'walkoff':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 	'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
-	act 'Leave the gang': gt 'pavResidential'
+	act 'Leave the gang': gt 'pav_residential'
 end
 
 if $ARGS[0] =  'somethingelse':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'agreesteal':
 			grupvalue[4] -= 200
 			gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 			gs 'stat'
-			act 'Leave the gang': gt 'pavResidential'
+			act 'Leave the gang': gt 'pav_residential'
 		end
 		act 'Beg for another chance':
 			cla & *clr
@@ -174,7 +174,7 @@ if $ARGS[0] = 'noslut':
 	grupvalue[4] -= 200
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
-	act 'Leave the gang': gt 'pavResidential'
+	act 'Leave the gang': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'gopnik party':

locations/gopskver.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = '':
 					'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
 					'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
 
-					act 'Leave':gt 'pavResidential'
+					act 'Leave':gt 'pav_residential'
 				end
 			end
 		elseif hour < 20:

locations/gpoli.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = '':
 
 	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0: '<br><br><a href="exec: minut += 5 & gt ''gpoli'', ''reception''">Ask</a> at the reception for help with your breasts.'
 
-	act 'Leave':minut += 5 & gt 'pavCommercial'
+	act 'Leave':minut += 5 & gt 'pav_commercial'
 
 	if preg = 2:
 		act 'Give birth':
@@ -1721,7 +1721,7 @@ if $ARGS[0] = 'maternity_ward':
 		end
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	end
 end
 
@@ -1823,10 +1823,10 @@ if $ARGS[0] = 'maternity_ward_donation':
 	elseif pcs_gpoli_donationsessioncount > 0:
 		'Sorry <<$pcs_firstname>>, we are closing now.'
 		'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	end
 end
 

locations/gschool_grounds.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'main':
 				'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
 			end
 
-			act 'Return to town': minut += 2 & gt 'pavResidential'
+			act 'Return to town': minut += 2 & gt 'pav_residential'
 
 			act 'Go to the prom party':
 				*clr & cla
@@ -131,7 +131,7 @@ if $ARGS[0] = 'main':
 				'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
 			end
 
-			act 'Return to town': minut += 2 & gt 'pavResidential'
+			act 'Return to town': minut += 2 & gt 'pav_residential'
 		end
 	end
 
@@ -181,7 +181,7 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	act 'Return to town': minut += 2 & gt 'pavResidential'
+	act 'Return to town': minut += 2 & gt 'pav_residential'
 
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
@@ -428,7 +428,7 @@ if $ARGS[0] = 'bulding':
 			end
 		end
 	end
-	act 'Return to town': minut += 2 & gt 'pavResidential'
+	act 'Return to town': minut += 2 & gt 'pav_residential'
 	if dimaRevenge = 1:
 		menu_off = 1
 		'You''re in a good mood today as you enter the school. That changes when Dimka stops you in the hall on the way to class.

locations/gskver.qsrc

@@ -92,12 +92,12 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
-	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
+	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 	act 'Walk to the Old Town (0:10)':minut += 10 & gt 'liam'
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
-	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
+	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pav_commercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pav_residential''">residential</a> area.'
 	if ((month > 7 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 0: 
 		'<br>You overhear someone speaking in front of a crowd. The crowd is quite rowdy, with lots of yelling and clapping throughout the <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_1''">meeting</a>.'
 	elseif ((month > 8 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 1 and alb_father_day < daystart:

locations/igorev.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'Movies':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/watchmovie.jpg" ></center>'
 					'You quietly sit with Igor and watch the movie, once the credits roll the two of you leave the theater. Once back outside he turns to you and says. "<<$pcs_nickname>> would you like to come back to my place?"'
 					act 'Agree and go back to Igor''s house': gt'Igorhome','hallway'
-					act 'Decline and go home': gt 'pavResidential'
+					act 'Decline and go home': gt 'pav_residential'
 				end
 				act 'Make out':
 					cls
@@ -115,7 +115,7 @@ if $ARGS[0] = 'Movies':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/kissmovie.jpg" ></center>'
 					'The movie is fairly boring and Igor strokes your thigh, you return the favor and lean in close to him. He turns to you and starts to kiss you. Soon the two of you are making out, you spend the rest of the time making out, you have no idea what the movie was even about. Once the credits roll the two of you leave the theater. Once back outside he turns to you and says. "<<$pcs_nickname>> would you like to come back to my place?"'
 					act 'Agree and go back to Igor''s house': gt'Igorhome','hallway'
-					act 'Decline and go home': gt 'pavResidential'
+					act 'Decline and go home': gt 'pav_residential'
 				end
 			end
 			act 'You don''t feel watching a movie':
@@ -685,7 +685,7 @@ if $ARGS[0] = 'din_sisterkom':
 							'<center><b><font color = maroon>Igor''s sister''s room</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/crossdress/ystala.jpg"></center>'
 							'You''ve gotten tired of trying on different outfits, perhaps it is time to call it a day. You say goodbye to Igor and quickly depart.'
-							act 'Go home': gt'pavResidential'
+							act 'Go home': gt'pav_residential'
 						end
 					end
 				end
@@ -821,7 +821,7 @@ if $ARGS[0] = 'din_sisterkom_krossdress':
 														'"I think we can pull it off again. Now get your cute ass out of here before someone catches us."'
 														'"Okay. See you later, honey."'
 														'"Later." Igor waves absently as you leave the room.'
-														act 'Go home':gt'pavResidential'
+														act 'Go home':gt'pav_residential'
 													end
 												end
 											end
@@ -869,7 +869,7 @@ if $ARGS[0] = 'caught':
 				'<center><img  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 				'After giving him a few moments to think. "Well I hope you figure things out and I promise not to tell anyone, but I really came over to study, so if you don''t mind, do you think you could help me with my homework?"'
 				'Igor practically skips over. "Of course, now where were we?" Soon the two of you are studying, after a bit you finish up and it is time for you to go.'
-				act 'Leave Igor''s home': gt 'pavResidential'
+				act 'Leave Igor''s home': gt 'pav_residential'
 			end
 			act 'Offer to help him':
 				*clr & cla
@@ -887,7 +887,7 @@ if $ARGS[0] = 'caught':
 					'<center><img  src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 					'After giving him a few moments to admire himself you sit down again. "Well I really came over to study, while I don''t mind helping you. I still need some help with my homework."'
 					'Igor practically skips over. "Of course, now where were we?" Soon the two of you are studying, after a bit you finish up and it is time for you to go.'
-					act 'Leave Igor''s home': gt 'pavResidential'
+					act 'Leave Igor''s home': gt 'pav_residential'
 				end
 				act 'Let''s go for a walk':
 					*clr & cla
@@ -1317,7 +1317,7 @@ if $ARGS[0] = 'Dimka':
 								'You tell him, "You can always tell Dimka that you don''t want a boyfriend right now after the date."'
 								'"Okay, that sounds like a good plan, I''ll meet with him and tell him that I''m not interested."'
 								'"I think that''s the best thing to do. I''m going home. I''ll talk to you later, okay!" you say to him as you leave.'
-								act 'Finish': gt'pavResidential'
+								act 'Finish': gt'pav_residential'
 							end
 						end
 					end
@@ -1533,7 +1533,7 @@ if $ARGS[0] = 'Ask about Dianas date':
 														'"No he was right to be upset, I betrayed him. I got exactly what I deserved." he shakes his head and then laughs. "Hell if I am being honest, I got exactly what I was hoping for. I just hope in time he can forgive me and we can become close again. I don''t mind being his girl."'
 														'"So you liked it? You liked being fucked by him?" you honestly ask him as you''re curious.'
 														'He thinks for a moment, "Yeah, yeah I did. I mean he was really rough and it hurt a lot at first, but I still kinda liked it. Look I don''t really want to talk about this anymore, okay?" With that, you don''t know what else to do, so you get up and leave.'
-														act 'Leave quickly': gt 'pavResidential'
+														act 'Leave quickly': gt 'pav_residential'
 													end
 												end
 											end

locations/igorhome.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'entrance':
 			act 'Walk around his home': gt 'igorhome','hallway'
 			act 'Go to his room': gt 'igorhome', 'igorroom'
 		end
-		act 'Decline his invitation and leave':IgorLove -= 1 & gt 'pavResidential'
+		act 'Decline his invitation and leave':IgorLove -= 1 & gt 'pav_residential'
 	elseif IgorLove <= 0:
 		IgorLoverQW = -1
 		if month > 8 or month < 4:
@@ -44,7 +44,7 @@ if $ARGS[0] = 'entrance':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/walk_home'+ rand(1,3) +'.jpg"></center>'
 		end
 		'As you walk towards Igor''s house, he starts having second thoughts "<<$pcs_firstname>>, you know I love you very much, but we don''t know each other well enough, so I''m wondering if we should let it be."'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 	!!this one is if Igor is a tutor in history
 	! if igor_history = 1:
@@ -73,7 +73,7 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
-	act '<b>Leave Igor''s home</b>': gt 'pavResidential'
+	act '<b>Leave Igor''s home</b>': gt 'pav_residential'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
 	act 'Igor''s sister''s room': gt 'igorhome','sisterroom'
@@ -131,18 +131,18 @@ if $ARGS[0] = 'igorroom':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talkgf.jpg"></center>'
 			'Igor looks at his watch. "If you stay any later, my mother will come in and make a fuss and talk about how unseemly it is for a boy to have a girl in his room this late."'
 			'You nod to him. "I understand, then I guess I will see you later."'
-			act 'Say goodbye and go home': gt 'pavResidential'
+			act 'Say goodbye and go home': gt 'pav_residential'
 			act 'Kiss':
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/kiss.mp4"></video></center>'
 				'You lean in and give him a quick kiss, he is a bit surprised at first but then returns it. Once you break the kiss you leave.'
-				act 'Say goodbye and go home': gt 'pavResidential'
+				act 'Say goodbye and go home': gt 'pav_residential'
 			end
 		else
 			cls
 			'<center><h4><font color="maroon">Igor''s Room</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'
 			'You look at the clock saying that it''s really late and that you need to go home.'
-			act 'Say goodbye and go home': gt 'pavResidential'
+			act 'Say goodbye and go home': gt 'pav_residential'
 		end
 	elseif hour >= 20:
 		cls
@@ -155,11 +155,11 @@ if $ARGS[0] = 'igorroom':
 		if week = 5 or week = 6:
 			'Igor looks at his watch and asks you "I want to have fun tonight. Let''s go to the disco!"'
 			act 'Agree': & minut += 20 & gt 'gdkin' & !!if they are dating I will add a new version but have not written it yet.
-			act 'Decline and go home': gt 'pavResidential'
+			act 'Decline and go home': gt 'pav_residential'
 			act 'Decline and chat instead':gt 'igorhome','Chat'
 		else
 			'Igor tells you its getting late, you could take the hint and leave or maybe chat just a little longer.'
-			act 'Take the hint and go home': gt 'pavResidential'
+			act 'Take the hint and go home': gt 'pav_residential'
 			act 'Chat just a little longer':gt 'igorhome','Chat'
 		end
 	end
@@ -1173,7 +1173,7 @@ if $ARGS[0] = 'home':
 			act 'Enter': gt 'igorhome','hallway'
 		else
 			'After knocking several times, no one answers. It seems no one is home or everyone is asleep.'
-			act 'Leave Igor''s home': gt 'pavResidential'
+			act 'Leave Igor''s home': gt 'pav_residential'
 		end
 	else
 		if hour >= 9 and hour < 18:
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'home':
 			act 'Enter': gt 'igorhome','hallway'
 		else
 			'After knocking several times, no one answers. It seems no one is home or everyone is asleep.'
-			act 'Leave Igor''s home': gt 'pavResidential'
+			act 'Leave Igor''s home': gt 'pav_residential'
 		end
 	end
 end
@@ -1195,7 +1195,7 @@ if $ARGS[0] = 'home2':
 	!!There is a 25% chance this happens instead of Igor answers then door in the above one. He is home just currently cross dressing and is afraid to answer the door.
 	!!Igor in drag
 	'No one answers and you are just about to leave when you see movement inside. Maybe they don''t want to be disturbed or maybe they didn''t hear you knocking, or maybe someone broke into their house. What should you do?'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 	act 'Knock again':
 		cla
 		'A few minutes later an out of breath disheveled Igor answers the door and invites you in.'
@@ -1203,7 +1203,7 @@ if $ARGS[0] = 'home2':
 	end
 	act 'Peek inside the window':
 		cla
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 		if igor_krossdress = 1:
 			'You look inside and you see Igor dressed as a girl running about in a panic.'
 			act 'Tap on the window':

locations/katjaEv.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = '':
 		'KatjaMastr - <<KatjaMastr>>'
 	end
 
-	act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+	act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 
 	act 'Go with Katja': minut += 5 & gt 'katjaEv', '1'
 end
@@ -84,7 +84,7 @@ if $ARGS[0] = '3':
 	if mey_vika['key'] = 1:
 		Act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 	end
 end
 
@@ -130,7 +130,7 @@ if $ARGS[0] = '5':
 				if mey_vika['key'] = 1:
 					Act 'Leave the room': gt 'mey_home', 'start'
 				else
-					act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 				end
 			end
 		else
@@ -160,7 +160,7 @@ if $ARGS[0] = '5':
 				if mey_vika['key'] = 1:
 					Act 'Leave the room': gt 'mey_home', 'start'
 				else
-					act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 				end
 			end
 		else
@@ -177,7 +177,7 @@ if $ARGS[0] = '6':
 		if mey_vika['key'] = 1:
 			Act 'Leave the room': gt 'mey_home', 'start'
 		else
-			act 'Say goodbye and leave':minut += 5 & KatjaHorny -= 5 & gt 'pavResidential'
+			act 'Say goodbye and leave':minut += 5 & KatjaHorny -= 5 & gt 'pav_residential'
 		end
 
 		exit
@@ -207,7 +207,7 @@ if $ARGS[0] = '6':
 				gt 'placer'
 			end
 
-			act 'Refuse and go home':minut += 5 & KatjaHorny -= 5 & gt 'pavResidential'
+			act 'Refuse and go home':minut += 5 & KatjaHorny -= 5 & gt 'pav_residential'
 
 			exit
 		elseif npc_sex['A14'] = 0:
@@ -215,7 +215,7 @@ if $ARGS[0] = '6':
 			KatjaLust += 1
 			'Katja starts chatting about boys, cosmetics and school with you.'
 
-			act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+			act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 		end
 	elseif katjaDeystRand = 2 and pcs_sweat >= 20:
 		'Katja wrinkled her nose "<<$pcs_nickname>>, you''re all sweaty. Do you want to take shower?"'
@@ -254,7 +254,7 @@ if $ARGS[0] = '6':
 						if mey_vika['key'] = 1:
 							Act 'leave the room': gt 'mey_home', 'start'
 						else
-							act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+							act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 						end
 					end
 				end
@@ -302,7 +302,7 @@ if $ARGS[0] = '6':
 										if mey_vika['key'] = 1:
 											Act 'Smile and leave the room': gt 'mey_home', 'start'
 										else
-											act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+											act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 										end
 									end
 								end
@@ -336,7 +336,7 @@ if $ARGS[0] = '6':
 										if mey_vika['key'] = 1:
 											Act 'Smile and leave the room': gt 'mey_home', 'start'
 										else
-											act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+											act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 										end
 									end
 								end
@@ -369,7 +369,7 @@ if $ARGS[0] = '6':
 					if mey_vika['key'] = 1:
 						Act 'Smile and leave the room': gt 'mey_home', 'start'
 					else
-						act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+						act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 					end
 				end
 			end
@@ -377,7 +377,7 @@ if $ARGS[0] = '6':
 		if mey_vika['key'] = 1:
 			Act 'Refuse leave the room': gt 'mey_home', 'start'
 		else
-			act 'Refuse and go home':minut += 5 & KatjaHorny -= 5 & gt 'pavResidential'
+			act 'Refuse and go home':minut += 5 & KatjaHorny -= 5 & gt 'pav_residential'
 		end
 
 		exit
@@ -446,7 +446,7 @@ if $ARGS[0] = 'kiss':
 							if mey_vika['key'] = 1:
 								Act 'Leave the room': gt 'mey_home', 'start'
 							else
-								act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+								act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 							end
 						else}
 							'Katja freezes in your arms and you stroke her body and kiss her neck.'
@@ -527,7 +527,7 @@ if $ARGS[0] = 'kiss':
 		if mey_vika['key'] = 1:
 			Act 'Smile and leave the room': gt 'mey_home', 'start'
 		else
-			act 'Say goodbye and leave':gt 'pavResidential'
+			act 'Say goodbye and leave':gt 'pav_residential'
 		end
 	end
 end

locations/katjaEvDin.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'strapon_main':
 		act 'Say goodbye and leave':
 			minut += 5
 			gs 'arousal', 'end'
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -244,7 +244,7 @@ if $ARGS[0] = 'shower_kiss':
 			act 'Say goodbye and leave':
 				minut += 5
 				gs 'arousal', 'end'
-				gt 'pavResidential'
+				gt 'pav_residential'
 			end
 		end
 	end
@@ -295,7 +295,7 @@ if $ARGS[0] = 'sex':
 
 			act 'Say goodbye and go home':
 				gs 'arousal', 'end'
-				gt 'pavResidential'
+				gt 'pav_residential'
 			end
 		end
 	end
@@ -322,7 +322,7 @@ if $ARGS[0] = 'sex':
 
 			act 'Say goodbye and go home':
 				gs 'arousal', 'end'
-				gt 'pavResidential'
+				gt 'pav_residential'
 			end
 		end
 	end
@@ -359,7 +359,7 @@ if $ARGS[0] = 'kuni':
 	else
 		act 'Say goodbye and go home':
 			gs 'arousal', 'end'
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -388,7 +388,7 @@ if $ARGS[0] = 'kuni_p':
 	else
 		act 'Say goodbye and go home':
 			gs 'arousal', 'end'
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -425,7 +425,7 @@ if $ARGS[0] = 'kuni_dom':
 				act 'Say goodbye and go home (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'pavResidential'
+					gt 'pav_residential'
 				end
 			else
 				act 'Say goodbye and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'kuni_dom':
 					act 'Decline and go home (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pavResidential'
+						gt 'pav_residential'
 					end
 				else
 					act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -473,7 +473,7 @@ if $ARGS[0] = 'kuni_dom':
 							act 'Decline and go home (<<will_cost>> Willpower)':
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pavResidential'
+								gt 'pav_residential'
 							end
 						else
 							act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -498,7 +498,7 @@ if $ARGS[0] = 'kuni_dom':
 								act 'Decline and go home (<<will_cost>> Willpower)':
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pavResidential'
+									gt 'pav_residential'
 								end
 							else
 								act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -526,7 +526,7 @@ if $ARGS[0] = 'kuni_dom':
 
 								act 'Go home':
 									gs 'arousal', 'end'
-									gt 'pavResidential'
+									gt 'pav_residential'
 								end
 							end
 						end
@@ -535,7 +535,7 @@ if $ARGS[0] = 'kuni_dom':
 			end
 		end
 	else
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 	end
 end
 

locations/katja_sex.qsrc

@@ -105,7 +105,7 @@ if $ARGS[0] = 'park':
 						'You try to protest. "It''s not fair, one of the guys held me as he kissed me and wouldn''t let me go."'
 						'Shaking her head you can tell she doesn''t care about any excuses. "You lose, I got five and you only got two." She said with a smug smile.'
 						'Giving up and smiling yourself. "Fine you win but I want a rematch tomorrow." She nods to the rematch.'
-						act 'Leave': gt'pavResidential'
+						act 'Leave': gt'pav_residential'
 					end
 				end
 			end

locations/korrPar.qsrc

@@ -297,7 +297,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				pcs_grades = 0
 				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''m extremely disappointed with you! I''ve warned you so many times! If you want to remain living in this house, you best start pulling your weight around here! Right now I want you out of the house, go out and find some work!" After that, she pushes you out the door and slams it shut in your face.'
 
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 				exit
 			elseif schoolPredupr = 1:
 				schoolPredupr = 2
@@ -322,7 +322,7 @@ if hour >= 16 and hour <= 20 and indorf = 0:
 				pcs_grades = 0
 				'As you enter the hallway, you find your mother there waiting for you. You have never seen her this furious. "<<$pcs_nickname>>? I just got off the phone with the school, they told me you didn''t show up yet again and expelled you. I''ve had it with you! I''ve warned you so many times! Go ahead, live your irresponsible life the way you want. You''re no longer welcome here." She already packed up all your things from your room before you got home, and roughly shoves the bag into your hands. After that, she pushes you out the door and slams it shut in your face.'
 
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 				exit
 			elseif schoolPredupr = 1:
 				schoolPredupr = 2

locations/kotovSex.qsrc

@@ -52,7 +52,7 @@ If $ARGS[0] = '':
 										npc_sex[$boy] -= 1
 										'When you keep refusing, he pushes you away and shouts: "Fine, go to your mother! Just leave me the fuck alone, we are done for! I''m so fucking done with this!"'
 										'Nothing you say can change his mind. Vitek feels like you''ve been leading him on for too long, and now he wants nothing to do with you.'
-										act 'Leave his apartment':gt'pavResidential'
+										act 'Leave his apartment':gt'pav_residential'
 									end
 								else
 									act 'Keep refusing(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/kotovdom.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'kotov_kom':
 	end
 	if npc_rel[$boy] <= 50 and $clothingworntype ! 'nude' and pcs_sweat < 20 :
 		'"Thanks for fun <<$pcs_nickname>>. " he says looking up at you from the bed. Seeing that you are ready to go, he tells: "Take care, You are always welcome here."'
-		act 'Say goodbye and leave his apartment':gt 'pavResidential'
+		act 'Say goodbye and leave his apartment':gt 'pav_residential'
 	end
 	if pcs_sweat >= 20:
 		'Vitek looks up at you from his bed and says: "You''re all sweaty, kitten. You should go take a shower before going home."'

locations/kuhrPar.qsrc

@@ -7,7 +7,7 @@ if fullmorrout = 1:
 		minut +=1
 		killvar 'fullmorrout'
 		gs 'korrPar'
-		gt'pavResidential'		
+		gt'pav_residential'		
 	end
 end
 

locations/leonid.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'firstTime':
 		gs 'underwear', 'wear'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/office.jpg"></center>'
 		'You quickly put your clothes on, surprised to find they are clean and fresh.'
-		act 'Leave':gt 'pavCommercialOffices'
+		act 'Leave':gt 'pav_commercial_offices'
 	end	
 end
 
@@ -81,7 +81,7 @@ if $ARGS[0] = 'hall':
 	leoCoffee = rand(80,100)
 	leoComfort = rand(0,30)
 	paperwork = rand(40,60)
-	act 'Get back':gt 'pavCommercialOffices'
+	act 'Get back':gt 'pav_commercial_offices'
 end
 
 if $ARGS[0] = 'office':

locations/mainQW.qsrc

@@ -65,7 +65,7 @@ act 'Investigate':
 					if StoryLine = 0:
 						gt 'city_residential'
 					else
-						gt 'pavResidential'
+						gt 'pav_residential'
 					end
 				end
 			end

locations/mey_home.qsrc

@@ -50,7 +50,7 @@ if $args[0] = 'door':
 		'No one opens the door, it looks like nobody''s home or they are all asleep.'
 		'Maybe you should try again at a more sociable time?'
 
-		act 'Leave': minut += 5 & gt 'pavResidential'
+		act 'Leave': minut += 5 & gt 'pav_residential'
 	end
 end
 
@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 	'A large and bright hall, this "hallway" stretches for quite a bit, you''ve never seen anything like this before! There is a mirror covering half of one of the walls. You see the kitchen from the hallway, there''s a big oval dining table.'
 	'There are stairs leading to the second floor. You can also see two doors where the signs say "Toilet" and "Bathroom".'
 
-	act 'Leave the house':minut += 5 & gt 'pavResidential'
+	act 'Leave the house':minut += 5 & gt 'pav_residential'
 
 	if mey_vika['mey_vika_qw'] = 30 and mey_vika['qw_day'] ! daystart and hour = 23: gs 'mey_vika_events', 'case_gift'
 	if week mod 2 ! 0 and mey_vika['mey_vika_qw'] >= 32 and mey_vika['gym_day'] ! daystart and hour = 16 and minut >= 30: gs 'mey_vika_events', 'gym0'

locations/mey_tamara_events.qsrc

@@ -133,7 +133,7 @@ if $args[0] = 'next_meet':
 			'"Remember this, if you change your mind and want to hang out, come visit us anytime again! You’’re always welcome here!'
 
 			killvar 'zz_stage'
-			act 'Go home': gt 'pavResidential'
+			act 'Go home': gt 'pav_residential'
 			act 'Stay the night': gt 'mey_home', 'start'
 		end
 	end
@@ -443,7 +443,7 @@ if $args[0] = 'rebuke':
 	end
 	act 'Go home':
 		minut += 10
-		gt 'pavResidential'
+		gt 'pav_residential'
 	end
 end
 

locations/mey_vika_events.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'end_game':
 
 	minut += 5
 	killvar 'win'
-	act 'Go home': gt 'pavResidential'
+	act 'Go home': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'play_game':
@@ -719,7 +719,7 @@ if $ARGS[0] = 'park_qw':
 				pcs_mood += 5
 				if mey_vika['mey_vika_qw'] < 19: mey_vika['mey_vika_qw'] += 1
 				gs 'stat'
-				gt 'pavResidential'
+				gt 'pav_residential'
 			end
 		end
 	end
@@ -901,7 +901,7 @@ if $ARGS[0] = 'beach_ender':
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 		! on vsjak the fireman still wears check whether gg
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'): gs 'zz_clothing', 'fix_emergency'
-		gt 'pavResidential'
+		gt 'pav_residential'
 	end
 end
 

locations/noticeboard.qsrc

@@ -120,7 +120,7 @@ end
 
 
 if $ARGS[0] = 'test_advert0':
-	if $loc ! 'pavCommercial': 
+	if $loc ! 'pav_commercial': 
 		$result = '<<3*givemeheight>>,<<2*givemeheight>>,<<7*givemeheight>>,<<8*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -128,7 +128,7 @@ if $ARGS[0] = 'test_advert0':
 	end
 end
 if $ARGS[0] = 'test_advert1':
-	if $loc = 'pavCommercial': 
+	if $loc = 'pav_commercial': 
 		$result = '<<8*givemeheight>>,<<12*givemeheight>>,<<12*givemeheight>>,<<18*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -136,7 +136,7 @@ if $ARGS[0] = 'test_advert1':
 	end
 end
 if $ARGS[0] = 'test_advert2':
-	if $loc = 'pavCommercial': 
+	if $loc = 'pav_commercial': 
 		$result = '<<18*givemeheight>>,<<2*givemeheight>>,<<22*givemeheight>>,<<8*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -145,7 +145,7 @@ if $ARGS[0] = 'test_advert2':
 end
 
 if $ARGS[0] = 'test_advert3':
-	if $loc = 'pavCommercial': 
+	if $loc = 'pav_commercial': 
 		$result = '<<8*givemeheight>>,<<2*givemeheight>>,<<12*givemeheight>>,<<8*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -153,7 +153,7 @@ if $ARGS[0] = 'test_advert3':
 	end
 end
 if $ARGS[0] = 'test_advert4':
-	if $loc ! 'pavCommercial': 
+	if $loc ! 'pav_commercial': 
 		$result = '<<18*givemeheight>>,<<12*givemeheight>>,<<22*givemeheight>>,<<18*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -161,7 +161,7 @@ if $ARGS[0] = 'test_advert4':
 	end
 end
 if $ARGS[0] = 'test_advert5':
-	if $loc ! 'pavCommercial': 
+	if $loc ! 'pav_commercial': 
 		$result = '<<13*givemeheight>>,<<2*givemeheight>>,<<17*givemeheight>>,<<8*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 
@@ -169,7 +169,7 @@ if $ARGS[0] = 'test_advert5':
 	end
 end
 if $ARGS[0] = 'test_advert6':
-	if $loc ! 'pavCommercial': 
+	if $loc ! 'pav_commercial': 
 		$result = '<<3*givemeheight>>,<<12*givemeheight>>,<<7*givemeheight>>,<<18*givemeheight>>'
 		NumberOfNewAdverts += 1
 	else 

locations/obj_din.qsrc

@@ -2401,7 +2401,7 @@ if $ARGS[0] = 'emergency':
 	*nl
 
 	cla
-	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pavResidential'
+	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pav_residential'
 	act 'Go to City Residental':gt 'city_residential'
 	if $loc ! '' and $metka ! '':
 		act 'Cancel':gt $loc, $metka

locations/olutaxi.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'station':
 					'Djibril smiles in return. "It was nice meeting you as well."'
 					'You smile to Olu. "I will and thanks for the ride."'
 					'Olu returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
-					act 'Go to Pavlovsk Residential area': gt 'pavResidential'
+					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'liam'
 				end
 			end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'station':
 					'He starts up the van and pulls it out of the alleyway, out onto the street. He is listening to some music you have never heard before, you don''t even know what they are saying. It doesn''t take to long before you arrive at your destination. He pulls over to the curb and stops his van. "We are here, you be careful now, yes."'
 					'You smile to him. "I will and thanks for the ride."'
 					'He returns the smile. "Any time, good bye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
-					act 'Go to Pavlovsk Residential area': gt 'pavResidential'
+					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'liam'
 				end
 			end

locations/pavComplex.qsrc

@@ -131,9 +131,9 @@ if $ARGS[0] = 'start':
 	
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pavSharedApt', 'start'
-	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pavResidential'
-	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pavCommercial'
-	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
+	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pav_residential'
+	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif storyline = 1 and (home_owned[2] = 0 or pavSharedAptEnabled = 1):

locations/pav_commcenter.qsrc

@@ -10,7 +10,7 @@ $location_type = 'public_outdoors'
 gs 'stat'
 '<center><b><font color="maroon">Community Centre</font></b></center>'
 
-act 'Leave': minut += 2 & gt 'pavResidential'
+act 'Leave': minut += 2 & gt 'pav_residential'
 
 if hour >= 9 and hour < 20:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk.jpg"></center>'
@@ -49,11 +49,11 @@ end
 
 if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the sports section': gt 'gdksport', 'start'
 
-if hour >= 8 and hour < 18: act 'Go to the library': gt 'gdkbibl'
+if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 
 if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
 
-if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'gdkbibl'
+if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'pav_library'
 if nerd_game['game_day'] = daystart and hour = 20: act 'Go up stairs to the hobby clubs and <b>Join nerds</b>': gt 'nerd_game_night', 'game'
 
 if hour >= 8:act 'Go to the toilets': gt 'gdktoilet', 'start'

locations/pav_commclubs.qsrc

@@ -1,127 +1,84 @@
-# gdkbibl
+# pav_commclubs
 
 $metka = ''
-$loc = 'gdkbibl'
-$location_type = 'public_indoors'
-$menu_loc = 'gdkbibl'
+$loc = 'pav_commclubs'
+$menu_loc = 'pav_commclubs'
 $menu_arg = ''
 menu_off = 0
+$location_type = 'public_indoors'
+
 frost = 0
 gs 'stat'
+
 gs 'themes', 'indoors'
-'<center><b><font color="maroon">Community center library</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
-'For such a small town, this library is surprisingly large - containing many interesting books on a wide variety of subjects.'
+
+'<center><b><font color = maroon>The community center</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gdkkru.jpg"></center>'
+
 
 act 'Leave': gt 'pav_commcenter'
 
 act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'gdkbibl'
-if nerd_game['game_day'] = daystart and hour = 20: act 'Join the <b>nerds</b>': gt 'nerd_game_night', 'game'
+if nerd_game['game_day'] = daystart and hour = 20: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
 
-if hour >= 8 and hour < 18:
-	act 'Read a book on science (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/science1.jpg"></center>'
-		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read an adventure novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
-		'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a fantasy novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
-		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a science fiction novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		grupvalue[3] +=1
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
-		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Read a romance novel (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		pcs_mood = 100
-		blizoruk += 1
-		pcs_horny += 20
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
-		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey...several of the scenes are very steamy and you find yourself getting quite aroused.'
-		act 'Put the book back': gt 'gdkbibl'
-	end
-	act 'Study for an hour':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		lern += rand(1,3)
-		blizoruk += 1
-		grupvalue[3] += 2
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/learning' + rand(1,3) + '.jpg"></center>'
-		'You read several books that should help you with your school work, you feel that you learned something today.'
-		act 'Put the book back': gt 'gdkbibl'
+if hour >= 12 and hour < 20:
+	'At this time of day the community center operates various clubs.'
+
+	if krumonth = month and kruyear = year:
+		act 'Go to the sewing club': gt 'krupo'
+	else
+		act 'Go to the sewing club':
+			cls
+			menu_off = 1
+			gs 'stat'
+			'<center><b><font color = maroon>Sewing circle</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/krupo.jpg"></center>'
+			'You went to the sewing club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
+			if money >= 500:
+				act 'Sign up':
+					cls
+					money -= 500
+					krumonth = month
+					kruyear = year
+					gs 'stat'
+					'You pay the tuition.'
+					act 'Leave': gt 'pav_commclubs'
+				end
+			end
+
+			act 'Leave': gt 'pav_commclubs'
+		end
 	end
-	act 'Read from the collected works of Leo Tolstoy (1:00)':
-		*clr & cla
-		menu_off = 1
-		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
-		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
-		minut += 60
-		sprt_exp += rand(3,6)
-		blizoruk += 1
-		grupvalue[3] +=2
-		gs'stat'
-		'<center><img <<$set_imgh>> src="images/shared/accessories/books/tolstoy.jpg"></center>'
-		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
-		act 'Put the book back': gt 'gdkbibl'
+     
+	if chessmonth = month and chessyear = year:
+		act 'Go to the chess club': gt 'kruchess'
+	else
+		act 'Go to the chess club':
+			cls
+			menu_off = 1
+			gs 'stat'
+			'<center><b><font color = maroon>Chess Circle</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/kruchess.jpg"></center>'
+			'You went to the chess club room, as you walked in, a teacher looked at you said. "It costs 500 <b>₽</b> for one month to join, you can come as many days as you like. Once the month is up any days you did not attend are not transferred."'
+			if money >= 500:
+				act 'Sign up':
+					cls
+					money -= 500
+					chessmonth = month
+					chessyear = year
+					gs'stat'
+					'You pay the tuition.'
+					act 'Leave': gt 'pav_commclubs'
+				end
+			end
+
+			act 'Leave': gt 'pav_commclubs'
+		end
 	end
 else
-	'The library is closed.'
+	'Club''s closed.'
 end
 
---- gdkbibl ---------------------------------
+--- pav_commclubs ---------------------------------
 

locations/pavCommercial.qsrc → locations/pav_commercial.qsrc

@@ -1,13 +1,13 @@
-# pavCommercial
+# pav_commercial
 
 CLOSE ALL
 
 $metka = ''
-$loc = 'pavCommercial'
+$loc = 'pav_commercial'
 $location_type = 'public_outdoors'
 $metkaStreet = ''
-$locStreet = 'pavCommercial'
-$menu_loc = 'pavCommercial'
+$locStreet = 'pav_commercial'
+$menu_loc = 'pav_commercial'
 $menu_arg = ''
 menu_off = 0
 
@@ -30,7 +30,7 @@ boynumBlock = 0
 bankloc = 0
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour + 2 < hour:gt'street_event','pavCommercial', 'main'
+if streetevent_hour + 2 < hour:gt'street_event','pav_commercial', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
 if month >= 11 or month <= 3:
@@ -55,7 +55,7 @@ end
 *nl
 'The nearby residential area is next to the lake and the town surrounds the old palace grounds which are now a large <a href="exec:minut += 5 & gt ''gskver'', ''start''">public park</a>.'
 
-gs'street_event','pavCommercial', 'extras'
+gs'street_event','pav_commercial', 'extras'
 
 if AlbFather >= 1:
 	if AlbFaterBlackTime = 0:AlbFaterBlackTime = totminut + 2880
@@ -128,7 +128,7 @@ end
 '<br>The rest of the street is filled with smaller locally owned businesses, most notable being <<$desc_txt1>>.'
 
 if leonidSlave = 1:
-	'<br>Near the town hall there is an old <a href="exec:minut += 15 & gt ''pavCommercialOffices''">office building</a>.'
+	'<br>Near the town hall there is an old <a href="exec:minut += 15 & gt ''pav_commercial_offices''">office building</a>.'
 end
 
 if hour >= 7 and hour <= 18:
@@ -141,8 +141,8 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
-act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
-act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
+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 'pavcomplex', 'start'
 act 'Walk to the train station (0:10)':minut += 10 & gt 'pavtrain'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
@@ -171,5 +171,5 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
---- pavCommercial ---------------------------------
+--- pav_commercial ---------------------------------
 

locations/pavCommercialOffices.qsrc → locations/pav_commercial_offices.qsrc

@@ -1,10 +1,10 @@
-# pavCommercialOffices
+# pav_commercial_offices
 
 $metka = ''
-$loc = 'pavCommercialOffices'
+$loc = 'pav_commercial_offices'
 $metkaStreet = ''
-$locStreet = 'pavCommercialOffices'
-$menu_loc = 'pavCommercialOffices'
+$locStreet = 'pav_commercial_offices'
+$menu_loc = 'pav_commercial_offices'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL
@@ -12,8 +12,8 @@ CLOSE ALL
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/officebuilding.jpg"></center>'
 'You are in front of the small office building.'
 act 'Go inside':gt 'leonid', 'hall'
-act 'Get back':gt 'pavCommercial'
+act 'Get back':gt 'pav_commercial'
 
 
---- pavCommercialOffices ---------------------------------
+--- pav_commercial_offices ---------------------------------
 

locations/pav_factory.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'tailor':
 	'Behind the counter an elderly man is inspecting some repaired clothes, he stops and smiles gently, greeting you.'
 	'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
 
-	act 'Leave': gt 'pavIndustrial'
+	act 'Leave': gt 'pav_industrial'
 
 	if money >= 500:
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
@@ -30,7 +30,7 @@ if $ARGS[0] = 'tailor':
 				'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 			end
 
-			act 'Leave': minut += 5 & gt 'pavIndustrial'
+			act 'Leave': minut += 5 & gt 'pav_industrial'
 		end
 
 		act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
@@ -56,7 +56,7 @@ if $ARGS[0] = 'enter':
 	if workFabrika = 0 and age < 18:'You can apply for a <a href="exec:minut += 15 & gt ''pav_factory'', ''job_start''">part-time job</a> here.'
 	if work = 0 and workFabrika = 0 and age >= 18:'You can apply for a <a href="exec:minut += 15 & gt ''pav_factory'', ''job_start''">full-time job</a> here.'
 
-	act 'Leave': minut += 5 & gt 'pavIndustrial'
+	act 'Leave': minut += 5 & gt 'pav_industrial'
 
 	if workFabrika = 1 and week >= 1 and week <= 5 and hour >= 8 and hour < 9 and age >= 18:
 		'Your shift is starting now.'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'job':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/pav_factory.jpg" ></center>'
 	'You work hard throughout your shift at the factory. The foreman has you running all over the factory performing all type of tasks. You barely even have time to rest during the shift.'
 
-	act 'Leave': minut += 5 & gt 'pavIndustrial'
+	act 'Leave': minut += 5 & gt 'pav_industrial'
 end
 
 --- pav_factory ---------------------------------

locations/pavIndustrial.qsrc → locations/pav_industrial.qsrc

@@ -1,13 +1,13 @@
-# pavIndustrial
+# pav_industrial
 
 CLOSE ALL
 
 $metka = ''
-$loc = 'pavIndustrial'
+$loc = 'pav_industrial'
 $location_type = 'public_outdoors'
 $metkaStreet = ''
-$locStreet = 'pavIndustrial'
-$menu_loc = 'pavIndustrial'
+$locStreet = 'pav_industrial'
+$menu_loc = 'pav_industrial'
 $menu_arg = ''
 menu_off = 0
 
@@ -27,7 +27,7 @@ alkoblock = 0
 boynumBlock = 0
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour + 2 < hour:gt'street_event','pavIndustrial', 'main'
+if streetevent_hour + 2 < hour:gt'street_event','pav_industrial', 'main'
 
 '<center><h2>Pavlovsk Industrial District</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/pav_factory.jpg"></center>'
@@ -47,7 +47,7 @@ end
 *nl
 'In a smaller building right next to the factory is the local '+iif(week < 7 and hour >= 8 and hour < 18,'<a href="exec: gt ''pav_factory'', ''tailor''">tailor</a>', 'tailor')+' shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 17:00.'
 
-gs'street_event','pavIndustrial', 'extras'
+gs'street_event','pav_industrial', 'extras'
 
 if AlbFather >= 1:
 	if AlbFaterBlackTime = 0:AlbFaterBlackTime = totminut + 2880
@@ -82,8 +82,8 @@ else
 end
 
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pavcomplex', 'start'
-act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pavResidential'
-act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 
 if week < 7 and hour >= 8 and hour < 18: 
 	act 'Visit the tailor': gt 'pav_factory', 'tailor'
@@ -119,5 +119,5 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
 end
 
---- pavIndustrial ---------------------------------
+--- pav_industrial ---------------------------------
 

locations/pav_library.qsrc

@@ -0,0 +1,127 @@
+# pav_library
+
+$metka = ''
+$loc = 'pav_library'
+$location_type = 'public_indoors'
+$menu_loc = 'pav_library'
+$menu_arg = ''
+menu_off = 0
+frost = 0
+gs 'stat'
+gs 'themes', 'indoors'
+'<center><b><font color="maroon">Community center library</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
+'For such a small town, this library is surprisingly large - containing many interesting books on a wide variety of subjects.'
+
+act 'Leave': gt 'pav_commcenter'
+
+act 'Go to the toilets': gt 'gdktoilet', 'start'
+
+if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'pav_library'
+if nerd_game['game_day'] = daystart and hour = 20: act 'Join the <b>nerds</b>': gt 'nerd_game_night', 'game'
+
+if hour >= 8 and hour < 18:
+	act 'Read a book on science (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		intel_exp += rand(3,6) + (mentats_dose - rand(0,mentats_dose))
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/science1.jpg"></center>'
+		'You spend an hour reading, trying to make sense of all the clever propositions writen inside and to finally understand the subject it describes.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read an adventure novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fiction' + rand(1,2) + '.jpg"></center>'
+		'You spend an hour reading an adventure novel, immersing yourself in daring deeds and awesome twists.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a fantasy novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/fantasy' + rand(1,9) + '.jpg"></center>'
+		'You spend an hour reading a fantasy novel, rescuing damsels from dragons, digging for jewels with dwarves and performing word changing magic alongside elves and druids.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a science fiction novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		grupvalue[3] +=1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/scifi' + rand(1,6) + '.jpg"></center>'
+		'You spend an hour reading a science fiction novel - flying off into space, travelling though time, running from rogue AI''s and creating monsters with your hunchbacked assistant.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read a romance novel (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		pcs_mood = 100
+		blizoruk += 1
+		pcs_horny += 20
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/romance' + rand(1,20) + '.jpg"></center>'
+		'You spend a very short hour reading a romance novel - choosing between a vampire or a werewolf, falling in love with an obscenely wealthy Grey...several of the scenes are very steamy and you find yourself getting quite aroused.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Study for an hour':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		lern += rand(1,3)
+		blizoruk += 1
+		grupvalue[3] += 2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/learning' + rand(1,3) + '.jpg"></center>'
+		'You read several books that should help you with your school work, you feel that you learned something today.'
+		act 'Put the book back': gt 'pav_library'
+	end
+	act 'Read from the collected works of Leo Tolstoy (1:00)':
+		*clr & cla
+		menu_off = 1
+		if blizoruk = 100 or glassqw = 1: glassqw = 1 & msg 'The text blurs across the page, it seems that your eyesight is actually pretty poor. Maybe you should head to the city and visit an ophthalmologist.' & gt $curloc
+		if pcs_nerd > 0: lastread = totminut & lastreadday = daystart & pcs_nerd += 1
+		minut += 60
+		sprt_exp += rand(3,6)
+		blizoruk += 1
+		grupvalue[3] +=2
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/books/tolstoy.jpg"></center>'
+		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
+		act 'Put the book back': gt 'pav_library'
+	end
+else
+	'The library is closed.'
+end
+
+--- pav_library ---------------------------------
+

locations/pav_pharmacy.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start' or $message ! '':
 	end
 	*nl
 	
-	act 'Leave the pharmacy':gt 'pavCommercial'
+	act 'Leave the pharmacy':gt 'pav_commercial'
 
 	if $message ! '':
 		$message

locations/pavResidential.qsrc → locations/pav_residential.qsrc

@@ -1,14 +1,14 @@
-# pavResidential
+# pav_residential
 
 music_loop = 0
 CLOSE ALL
 $metka = ''
-$loc = 'pavResidential'
-$menu_loc = 'pavResidential'
+$loc = 'pav_residential'
+$menu_loc = 'pav_residential'
 $menu_arg = ''
 menu_off = 0
 $metkaStreet = ''
-$locStreet = 'pavResidential'
+$locStreet = 'pav_residential'
 $location_type = 'public_outdoors'
 killvar '$locclass'
 
@@ -29,7 +29,7 @@ boynumBlock = 0
 gs 'stat'
 
 !call random events from [street_events], and display them before show location.
-if streetevent_hour + 2 < hour:gt'street_event','pavResidential', 'main'
+if streetevent_hour + 2 < hour:gt'street_event','pav_residential', 'main'
 
 '<center><h2>Pavlovsk</h2></center>'
 if month >= 11 or month <= 3:
@@ -49,7 +49,7 @@ end
 '<br>The residential area of a provincial town in Russia that has a population of roughly 15,000 people. This area is suburban with more modern houses, dusty roads and pockets of overgrown vegetation stretching out far and wide, but some would say that just adds to the town''s rustic charm. Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> built by Catherine the Great, with its surrounding gardens and forest, and the recently remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which is now a luxury hotel and restaurant.'
 '<br>Even from here you can spot the <a href="exec:minut += 5 & gt ''ParChurch'',''start''">Church of St Nikolas</a>, the tallest building in town.'
 
-gs'street_event','pavResidential', 'extras'
+gs'street_event','pav_residential', 'extras'
 
 if flag_rape_1 = 1:
 	flag_rape_1 = 0
@@ -79,7 +79,7 @@ if pav_slut >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart
 	if will_cost <= pcs_willpwr:
 		act 'Decline (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	else
 		act 'Decline (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -113,7 +113,7 @@ if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car
 
 if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<br><a href="exec: minut += 5 & gt ''FedorEv4'', ''Home Entrance''">Fedor</a> lives in a house nearby.'
 
-if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
+if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$locM = ''pav_residential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
 
 if StoryLine > 0:
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
@@ -153,8 +153,8 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 end
 
 act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pavcomplex', 'start'
-act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pavCommercial'
-act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 
 act 'Wait':gs 'obj_din', 'wait'
 
@@ -187,7 +187,7 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 			'You hide for a few minutes watching groups of students pass you by as you wait for a lone victim to pounce on. You lie in wait for almost thirty minutes, thinking about the meal ahead, your hand finding its way between your legs a few times.'
 			'This time you are unsuccessful and fail to find a suitable meal.'
 
-			act 'Return': gt 'pavResidential'
+			act 'Return': gt 'pav_residential'
 		end
 	end
 end
@@ -205,7 +205,7 @@ if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3)
 	else
 		'Once again you run into uncle Misha, your neighbor. He notices the sperm on your face: "Again? Looks like you''ve been busy, girl. Nice look, it suits you."'
 	end
-	act 'Continue':gt 'pavResidential'
+	act 'Continue':gt 'pav_residential'
 	exit
 end
 
@@ -263,5 +263,5 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 end
 
 
---- pavResidential ---------------------------------
+--- pav_residential ---------------------------------
 

locations/pavtrain.qsrc

@@ -177,7 +177,7 @@ end
 
 gs 'family'
 
-act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pavCommercial'
+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'
 

locations/placer.qsrc

@@ -25,7 +25,7 @@ gs 'stat'
 $textEvent = ''
 if place = 0:
 	!!street
-	if litltown = 1:$numplace = 'pavResidential'
+	if litltown = 1:$numplace = 'pav_residential'
 elseif place = 1:
 	!!square
 	$numplace = 'gskver'

locations/placer_end.qsrc

@@ -27,7 +27,7 @@ if Frend_num = 14:
 
 	act 'Leave':
 		Frend_num = 0
-		gt 'pavResidential'
+		gt 'pav_residential'
 	end
 end
 

locations/placer_sex.qsrc

@@ -97,7 +97,7 @@ if $args[0] = 'meet':
 				'Finally the last guy spills his seed over your exhausted body, and they all leave the room except for <<$boydesc2>>. He sits down on a different bed, chuckling while he watches you sluggishly brush up. Your legs are shaky from the exhaustion, and the alcohol is also still in your system. Both of those factors make you feel rather disoriented, and you try to ignore <<$boydesc2>>''s smug grin. When you''re ready to leave, he waves you goodbye with a smirk on his face: "You were a nice fuck, <<$pcs_nickname>>. I see why Pavlovsk girls are so popular... we''ll definitely be visiting again."'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave the hostel':podvalrape = 0 & gt'pavResidential'
+				act 'Leave the hostel':podvalrape = 0 & gt'pav_residential'
 
 			elseif endrandom = 1:
 				act 'Open your eyes':
@@ -114,7 +114,7 @@ if $args[0] = 'meet':
 					'Those bastards! You quickly get dressed and try to cover up the writings as much as you can before leaving the room. Hopefully you can clean that up before anyone sees it on you!'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave the hostel':podvalrape = 0 & gt'pavResidential'
+					act 'Leave the hostel':podvalrape = 0 & gt'pav_residential'
 				end
 			end
 		end
@@ -240,7 +240,7 @@ if $args[0] = 'piano':
 								end
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Decline and leave': minut += 10 & gs'stat' & gt'pavResidential'
+								act 'Decline and leave': minut += 10 & gs'stat' & gt'pav_residential'
 							end
 						end
 					end
@@ -337,7 +337,7 @@ if $args[0] = 'piano':
 															dynamic $din_dush
 															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+															act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 														end
 													end
 												end
@@ -381,7 +381,7 @@ if $args[0] = 'piano':
 															dynamic $din_dush
 															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Leave their apartment': minut += 10 & gs'stat' & gt'pavResidential'
+															act 'Leave their apartment': minut += 10 & gs'stat' & gt'pav_residential'
 														end
 													end
 												end
@@ -433,7 +433,7 @@ if $args[0] = 'piano':
 													dynamic $din_dush
 													gs 'arousal', 'end'
 													gs 'stat'
-													act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+													act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 												end
 											end
 										end
@@ -548,7 +548,7 @@ if $args[0] = 'vodka2':
 							'The guys were hoping you would stay over, and try to pursuade you: "You don''t have to go, <<$pcs_nickname>>! You can just crash here, we can still hang out for a while longer and chat! Besides... I make the world''s best omelette! You''d be robbing yourself of a once-in-a-lifetime experience if you don''t at least have a taste of that in the morning!"'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Decline and leave': minut += 30 & gs'stat' & gt'pavResidential'
+							act 'Decline and leave': minut += 30 & gs'stat' & gt'pav_residential'
 							act 'Agree to sleep over': gt 'placer_sex', 'stay'
 						end
 					end
@@ -614,7 +614,7 @@ if $args[0] = 'vodka2':
 											end
 											gs 'arousal', 'end'
 											gs 'stat'
-											act 'Decline and leave': minut += 10 & gs'stat' & gt'pavResidential'
+											act 'Decline and leave': minut += 10 & gs'stat' & gt'pav_residential'
 										end
 									end
 								end
@@ -721,7 +721,7 @@ if $args[0] = 'twister':
 							$orgasm_or = 'yes'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+							act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 						end
 					end
 				end
@@ -851,7 +851,7 @@ if $args[0] = 'card_sex':
 							dynamic $din_dush
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+							act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 						end
 					end
 				end
@@ -914,7 +914,7 @@ if $args[0] = 'card_stript':
 								'The boys extend their hands hopefully, thinking that maybe you changed your mind. But you crush that hope by giving them a wink and then quickly leaving the apartment, before they can object.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Return to the streets': minut += 10 & gs'stat' & gt'pavResidential'
+								act 'Return to the streets': minut += 10 & gs'stat' & gt'pav_residential'
 							else
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/placer_sex73.jpg"></center>'
@@ -972,7 +972,7 @@ if $args[0] = 'card_stript':
 												dynamic $din_dush
 												gs 'arousal', 'end'
 												gs 'stat'
-												act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+												act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 											end
 										end
 									end
@@ -1000,7 +1000,7 @@ if $args[0] = 'card_win':
 		end
 		'You have a cruel grin on your face when you tell them: "Okay boys, start running!"'
 		'You watch them run across the street naked, and laugh out loud when several passers-by look at them funny and make comments. After they put their clothes back on, you decide to call it a night and say goodbye to them, giving them both a kiss before you go.'
-		act 'Leave the apartment': minut += 10 & gs'stat' & gt'pavResidential'
+		act 'Leave the apartment': minut += 10 & gs'stat' & gt'pav_residential'
 	end
 end
 
@@ -1066,7 +1066,7 @@ if $args[0] = 'stay_in_bed':
 									dynamic $din_dush
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Return to the streets': minut += 10 & gs'stat' & gt'pavResidential'
+									act 'Return to the streets': minut += 10 & gs'stat' & gt'pav_residential'
 								end
 							end
 						end
@@ -1160,7 +1160,7 @@ if $args[0] = 'stay_in_bed':
 									dynamic $din_dush
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Leave the apartment':minut += 10 & gs'stat' & gt'pavResidential'
+									act 'Leave the apartment':minut += 10 & gs'stat' & gt'pav_residential'
 								end
 							end
 						end
@@ -1367,7 +1367,7 @@ gs 'stat'
 								'When you pull the door shut behind you, you sigh. You know he was just renting that apartment for a short stay, and that you''ll probably never see him again. What a shame.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Return to the streets': minut += 10 & gs'stat' & gt'pavResidential'
+								act 'Return to the streets': minut += 10 & gs'stat' & gt'pav_residential'
 							end
 						end
 					end
@@ -1400,7 +1400,7 @@ if $args[0] = 'breakfast':
 			'Everyone gathers at the table, and you have to admit: his omelettes are fantastic. The guys occasionally glance over your body while you eat... you never did put on more clothes and are still sitting in your underwear. You feel comfortable around them though, and your lack of clothes doesn''t bother you at all. They don''t make any further moves on you, but ask if you want to stay around a while longer.'
 			'Unfortunately you have to decline, and say you have other things to do.'
 			'After you get dressed, the boys each give you a kiss on the cheek and say goodbye.'
-			act 'Leave their apartment': minut += 10 & gs'stat' & gt'pavResidential'
+			act 'Leave their apartment': minut += 10 & gs'stat' & gt'pav_residential'
 		end
 	end
 end
@@ -1733,8 +1733,8 @@ if $args[0] = 'rape':
 																	'What could he want with you? Especially after today''s events?'
 																	gs 'arousal', 'end'
 																	gs 'stat'
-																	act 'Keep the photo and go home': VIEW & Foto = 1 & gt'pavResidential'
-																	act 'Discard the photo and go home': VIEW & gt'pavResidential'
+																	act 'Keep the photo and go home': VIEW & Foto = 1 & gt'pav_residential'
+																	act 'Discard the photo and go home': VIEW & gt'pav_residential'
 																end
 															end
 														end
@@ -1764,7 +1764,7 @@ if $args[0] = 'rape':
 			end
 		end
 	else
-		minut += 10 & gs'stat' & gt'pavResidential'
+		minut += 10 & gs'stat' & gt'pav_residential'
 	end
 end
 

locations/podval_rape.qsrc

@@ -82,7 +82,7 @@ elseif podvalrape = 1:
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		end	
 	elseif endrandom = 1:
 		act 'Open your eyes':
@@ -101,7 +101,7 @@ elseif podvalrape = 1:
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		end  	
 	end
 end

locations/porn_view.qsrc

@@ -6,7 +6,7 @@ menu_off = 1
 act 'Go':
 	killvar '$_zz_boy_arr'
 	minut += iif(seepornofut < 4,rand(15,30),rand(60,80))
-	gt 'pavResidential'
+	gt 'pav_residential'
 end
 
 ! the initial string
@@ -28,7 +28,7 @@ if seepornofut < 10:
 		! to escape can only first few times
 		if seepornofut < 3:
 			cla
-			act 'Escape': gt 'pavResidential'
+			act 'Escape': gt 'pav_residential'
 		end
 
 		if seepornofut = 0:
@@ -45,7 +45,7 @@ if seepornofut < 10:
 			act 'Stay':
 				cla
 				seepornofut += 1
-				act 'Go': gt 'pavResidential'
+				act 'Go': gt 'pav_residential'
 				func('porn_view_strings', 'view_2_virgin_next')
 
 				exit
@@ -471,7 +471,7 @@ if seepornofut >= 10:
 					dynamic $showerdin
 					killvar '$_zz_boy_arr'
 					minut += iif(seepornofut < 4,rand(15,30),rand(60,80))
-					gt 'pavResidential'
+					gt 'pav_residential'
 				end
 			end
 		end

locations/postdeliveries.qsrc

@@ -1468,7 +1468,7 @@ if $ARGS[0] = 'finishround':
 	end
 	if postjobQW = 999: '"I better let Aleksiy know he needs to come in again on Saturdays, from now on. I knew I shouldn''t have trusted you!" he sighs, shaking his head in disappointment as he walks off. Guess you''re not getting paid for the day...'
 !! actions after your round is finished, default plus options if a long scene was triggered during your round
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 	if posteventQW1 = 2: act 'Return to the married man''s house': gt 'postevents', '1'
 	if posteventQW2 = 2: act 'Go back to Jenya and Arsen''s apartment': gt 'postevents', '2'
 	if posteventQW3 = 2: act 'Return to the businessman''s house': gt 'postevents', '3'

locations/postevents.qsrc

@@ -64,7 +64,7 @@ if $ARGS[0] = '1':
 								'"I guess that sounds fair?" he says, still a bit confused.'
 								'You give him a soft kiss on the cheek and say: "Good luck tonight!"'
 								'Before he can reply, you go to the bathroom and change back into your regular clothes.'
-								act 'Leave his apartment': gt 'pavResidential'
+								act 'Leave his apartment': gt 'pav_residential'
 							end
 						else
 							act 'Don''t do it, but tell him he deserves better (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -84,7 +84,7 @@ if $ARGS[0] = '1':
 					'"Great on me, you mean?" you laugh at him, nodding at the tenting erection in his pants. The man nods embarrassedly and leaves so you can change.'
 					'You put your regular clothes back on and go find him outside, who clearly looks relieved.'
 					'He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask, but you really helped me out today. Please take this for your time."'
-					act 'Take the money and leave': gt 'pavResidential'		
+					act 'Take the money and leave': gt 'pav_residential'		
 				end
 			end
 		else
@@ -99,7 +99,7 @@ if $ARGS[0] = '1':
 			'The man snaps out of his daydream and nods: "Erm, yes! Thank you! That was exactly what I needed to see, it looks great!"'
 			'You change back into your regular clothes and go find the man outside, who clearly looks relieved.'
 			'"If this won''t do it, I don''t know what will," he mutters. He offers you 300 <b>₽</b> and a wide smile: "Thank you so much! I know it was weird of me to ask..."'
-			act 'Take the money and leave': gt 'pavResidential'
+			act 'Take the money and leave': gt 'pav_residential'
 		end
 	end
 end
@@ -149,7 +149,7 @@ if $ARGS[0] = '1-1':
 			'"Happy to help!" you wink at him, and go to the bathroom to freshen up. After you use a wash cloth to clean the sperm off your body, you get dressed again and return to the living room. The man is already rehearsing some lines he plans to use on his wife tonight.'
 			'You give him a soft kiss on his cheek and whisper: "Good luck tonight! You can do it!" and see yourself out.'
 
-			act 'Leave his apartment': gt 'pavResidential'
+			act 'Leave his apartment': gt 'pav_residential'
 		end
 	end
 end
@@ -208,7 +208,7 @@ if $ARGS[0] = '2':
 					'Maksim also seems upset: "I already promised the subscribers a threesome!"'
 					'"Relax, baby! It''s okay. Come here, I''ll take care of the both of you! That''s still a threesome, right?" she says, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. You hear loud slurping sounds coming from the bedroom while you get dressed again in the living room. Jenya truly seems to enjoy what she does...'
 
-					act 'Leave the apartment': gt 'pavResidential'
+					act 'Leave the apartment': gt 'pav_residential'
 				end
 			else
 				act 'Say you don''t want to do this and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -246,7 +246,7 @@ if $ARGS[0] = '2':
 					'Maksim also seems upset: "I already promised the subscribers a threesome! This sucks..."'
 					'"Relax, baby! I''m sorry, she changed her mind. Come here, I''ll take care of the both of you! That''s still a threesome, right Maksim?" she smiles, pulling the two of them towards the bed. "See yourself out, will you?" the girl waves you off with a wink, before she takes both the cocks in her hands and begins to jerk them off. The guys completely forget about you, and you walk out of the room quietly.'
 
-					act 'Get dressed and leave': gt 'pavResidential'
+					act 'Get dressed and leave': gt 'pav_residential'
 				end
 			else
 				act 'Say you don''t want to do this and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -352,7 +352,7 @@ if $ARGS[0] = '2-1':
 						'You put your clothes back on with a little help from Jenya, and walk to the living room with her. You see Arsen and Maksim near the PC again, looking over photos of you getting fucked from behind while you eat Jenya''s snatch. They both give you a dismissive nod when they realize you''re leaving.'
 						'She walks you down the stairs and kisses you on the cheek one more time before heading back up. Hopefully they''ll keep those photos to themselves...'
 
-						act 'Lean against a wall and figure out where you are': gt 'pavResidential'
+						act 'Lean against a wall and figure out where you are': gt 'pav_residential'
 					end
 				end
 			end
@@ -442,7 +442,7 @@ if $ARGS[0] = '2-2':
 							'"You''re going to be a big hit in Germany!" Maksim winks. "Nah, just kidding. It''s a German amateur website, don''t worry. No one in Russia will find it, your secret is safe!"'
 							'Before you can say anything more, Jenya grabs you by the arm and pulls you to the door. "So... maybe we''ll see you soon, ''porn star''!" she grins, pushing you out of the apartment before giving you one last kiss before closing the door behind you.'
 							'Well, that just happened...'
-							act 'Return to the streets': gt 'pavResidential'
+							act 'Return to the streets': gt 'pav_residential'
 						end
 						act 'Tell her you can''t stay':
 							cla
@@ -453,7 +453,7 @@ if $ARGS[0] = '2-2':
 							'"Maybe. I deliver mail every week!" you smile while you put your clothes back on.'
 							'When you walk through the living room on your way out, you see Maksim and Arsen sitting at a desk in front of a computer screen again. They browse back and forth between images of your sperm-filled mouth, trying to decide on which is the best one. You probably don''t want to know what they''re going to do with those...'
 							'You decide not to disturb them, and leave the apartment.'
-							act 'Return to the streets': gt 'pavResidential'
+							act 'Return to the streets': gt 'pav_residential'
 						end
 					end
 				end
@@ -517,7 +517,7 @@ if $ARGS[0] = '2-2':
 						'You see a foreign porn website on the computer screen. A picture of your sperm-filled mouth is very prominent on it. The image set has already been downloaded several hundred times!'
 						'"You''re going to be a big hit in Germany!" Maksim winks. "Nah, just kidding. It''s a German amateur website, don''t worry. No one in Russia will find it, your secret is safe!"'
 						'Before you can say anything more, Jenya grabs you by the arm and pulls you to the door. "So... maybe we''ll see you soon, ''porn star''!" she grins, giving you one last kiss before closing the door.'
-						act 'Return to the streets': gt 'pavResidential'
+						act 'Return to the streets': gt 'pav_residential'
 					end
 					act 'Tell her you can''t stay':
 						cla
@@ -528,7 +528,7 @@ if $ARGS[0] = '2-2':
 						'"Maybe. I deliver mail every week!" you smile while you put your clothes back on.'
 						'When you walk through the living room on your way out, you see Maksim and Arsen sitting at a desk in front of a computer screen again. They browse back and forth between images of you having sperm in your mouth, trying to decide on which is the best one. You probably don''t want to know what they''re going to do with those...'
 						'You decide not to disturb them, and leave the apartment.'
-						act 'Return to the streets': gt 'pavResidential'
+						act 'Return to the streets': gt 'pav_residential'
 					end
 				end
 			end
@@ -681,7 +681,7 @@ if $ARGS[0] = '3-2':
 		'With that, he enters the bathroom. Figuring he expects you to see yourself out, you quickly change back into your normal clothes and put your new outfit in a bag.'
 		if school[11] = 0: school[11] = 1 & schoolH[11] = 150 & schoolB[11] = pcs_hips & schoolS[11] = 0
 		
-		act 'Leave his apartment': gt 'pavResidential'
+		act 'Leave his apartment': gt 'pav_residential'
 	end	
 end
 

locations/postoffice.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 							if bankloc = 1:
 								gt 'city_center'
 							else
-								gt 'pavCommercial'
+								gt 'pav_commercial'
 							end
 						end
 					end
@@ -349,7 +349,7 @@ if $postloc = 'leave':
 	if bankloc = 1:
 		gt 'city_center'
 	else
-		gt 'pavCommercial'
+		gt 'pav_commercial'
 	end
 end
 

locations/ratinglist.qsrc

@@ -641,7 +641,7 @@ act '<center><b>To fight between 2mja NPCs</b></center>':
 	end
 
 
-act 'Leave':gt 'pavResidential'
+act 'Leave':gt 'pav_residential'
 
 act '<center><b>h</b></center>':
 	cls