locations/HotelHole.qsrc

@@ -19,7 +19,7 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
-		act 'Go back to the High Street':minut += 3 & gt'pav_train'
+		act 'Go back to the High Street':minut += 3 & gt'pav_market'
 		
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'
@@ -139,7 +139,7 @@ if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and wa
 act 'Leave the hotel':
 	minut += 3
 	killvar 'prevloc'
-	gt'pav_train'
+	gt'pav_market'
 end
 
 if maidqw >= 1 and hour >= 16 and hour < 17:

locations/camera.qsrc

@@ -42,10 +42,10 @@ $camera_locations['pav_complex'] = {
 	$camera_return_loc_arg = 'start'
 }
 
-$camera_locations['pav_train'] = {
+$camera_locations['pav_train_hall'] = {
 	$camera_description = 'Pavlovsk Train Station'
-	$camera_event = 'pav_train'
-	$camera_return_loc = 'pav_train'
+	$camera_event = 'pav_train_hall'
+	$camera_return_loc = 'pav_train_hall'
 	$camera_return_loc_arg = 'start'
 }
 
@@ -337,7 +337,7 @@ if $ARGS[0] = 'pav_church':
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
-if $ARGS[0] = 'pav_train':
+if $ARGS[0] = 'pav_train_hall':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)

locations/cikl.qsrc

@@ -989,7 +989,7 @@ if katja_disco_end > 0: katja_disco_end = 0
 
 if npc_rel['A69'] > 60 and rand(0,3) = 0:npc_rel['A69'] -= 1
 
-!!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunfay her fall have not advanced for two weekends it will automatically advance.
+!!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunday her fall have not advanced this weekend it will automatically advance.
 if storyline = 1 and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
 	if soniafall < 7:
 		soniafallDay = daystart -1

locations/city_industrial_train.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'centre':
 
 	act 'Get off the train at this station':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 

locations/city_train.qsrc

@@ -10,35 +10,14 @@ if $ARGS[0] = 'start':
 	*clr & cla
 	gs'stat'
 	'<center><B>City center railway station</B></center>'
-	if hour < 9 or hour > 19:
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_night.jpg"></center>'
-	else
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_day.jpg"></center>'
-	end
-	'The main station for the city, it is always busy offering services to many destinations and the best place to park your car or hire a taxi.'
-
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
+	'The grand old station in the city centre is an impressive building. It is busy and has a number of shops and bars as well as all the platforms and trains. '
+	*nl
 	if car > 0 and cardrive = 2:
 		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 	end
 
 	act 'Go to the city center':minut += 5 & gt 'city_center'
-	act 'Enter the station building': minut += 1 & gt 'city_train', 'inside'
-end
-
-if $ARGS[0] = 'inside':
-	$loc_arg = 'inside'
-	$loc = 'city_train'
-	$location_type = 'public_indoors'
-	$menu_loc = 'city_train'
-	$menu_arg = 'inside'
-	menu_off = 0
-	*clr & cla
-	gs'stat'
-	'<center><B>City center railway station</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/central_station_inside.jpg"></center>'
-	'The grand old station is even more impressive on the inside and has a number of shops and bars as well as all the platforms and trains. '
-	*nl
-	act 'Leave the train station': minut += 1 & gt 'city_train', 'start'
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
 		act 'Go to the platforms': gt 'city_train', 'platform'
@@ -56,7 +35,7 @@ if $ARGS[0] = 'tickets':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg" ></center>'
 
-	act 'Leave the ticket office':minut += 1 & gt 'city_train', 'inside'
+	act 'Leave the ticket office':minut += 1 & gt 'city_train', 'start'
 	
 	act 'Buy a ticket':
 		cla
@@ -69,7 +48,7 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'city_train', 'inside'
+			act 'Return': gt 'city_train', 'start'
 		end
 	end
 
@@ -79,7 +58,7 @@ if $ARGS[0] = 'tickets':
 			menu_off = 1
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'city_train', 'inside'
+			act 'Return': gt 'city_train', 'start'
 		end
 	end	
 end
@@ -89,7 +68,7 @@ if $ARGS[0] = 'buy_ticket':
 	$menu_arg = 'buy_ticket'
 	menu_off = 0
 	
-	act 'Leave the ticket office': minut += 1 & gt 'city_train', 'inside'
+	act 'Leave the ticket office': minut += 1 & gt 'city_train', 'start'
 	
 	act 'Buy a ticket to the city industrial area (50 <b>₽</b>)':
 		if money >= 50:
@@ -137,7 +116,7 @@ if $ARGS[0] = 'platform':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/indusplat.jpg" ></center>'
 	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying shopping bags. It feels like it is always busy here, no matter at what time of the day it is.'
 
-	act 'Return to the station hall':gt 'city_train', 'inside'
+	act 'Return to the station hall':gt 'city_train', 'start'
 	
 	act 'Take a train to the city industrial area': gt 'city_train', 'ind'
 

locations/dimaRevenge.qsrc

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

locations/dorm.qsrc

@@ -157,21 +157,26 @@ if $ARGS[0] = 'eighth_floor':
 							kendra_busy = daystart
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
-							'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
-							*nl
-							'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
-							gs 'arousal', 'erotic_nudity', 3
-							gs 'stat'
-							act 'Enter': gt 'dormev1', 'kendra_male_slave'
-							act 'Decline':
-								*clr & cla
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
-								'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
-								'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
-								gs 'arousal', 'end'
-								gs 'stat'
+							if npc_rel['A84'] < 40:
+								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. When she see''s you she frowns. "I told you last time, I don''t have time for games and I am tired of yours. Now get lost, I''m busy." She closes the door in your face.'
 								act 'Leave':gt 'dorm', 'elevator'
+							else
+								'You knock on the door. After a couple of seconds, Kendra opens the door. She is standing in the doorway completely naked other than the strapon harness buckled in place around her hips, with a large black dildo attached to it that she is playing with. "Well if it isn''t my new favorite white slave bitch. I am kinda busy at the moment, I am punishing one of my other slaves."'
+								*nl
+								'She starts to close the door before you can even say anything, then she stops and smiles at you, like she just had a good idea. "Or you could come in and watch." She stands aside to let you come in, holding the door open. As you glance in the room, you see a naked college boy kneeling next to the couch. When he notices you he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she is going to do to him, considering the strapon she is wearing. Is that something you want to watch? It could be interesting and you might learn something from her as well. On the other hand do you want to humiliate him more than he already is?'
+								gs 'arousal', 'erotic_nudity', 3
+								gs 'stat'
+								act 'Enter': gt 'dormev1', 'kendra_male_slave'
+								act 'Decline':
+									*clr & cla
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
+									'You shake your head no. "No thanks you look busy and I don''t want to disturb you."'
+									'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
+									gs 'arousal', 'end'
+									gs 'stat'
+									act 'Leave':gt 'dorm', 'elevator'
+								end
 							end
 						end
 						act 'Leave':gt 'dorm', 'elevator'

locations/fame.qsrc

@@ -186,7 +186,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(25,60)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/6'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/6') < 1000:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/6'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/6 -1000)*3)/5'
+				end
 			end
 		elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']') > 400:
 			if $ARGS[2] = 'tiny':
@@ -206,7 +210,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(50,100)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/3'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/3') < 700:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)/3'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>/3') < 1300:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/3 -700)/2'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+				end
 			end
 		else
 			if $ARGS[2] = 'tiny':
@@ -226,7 +236,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 			elseif $ARGS[2] = 'bronzemedal':
 				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += rand(150,250)'			
 			else
-				dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += <<ARGS[2]>>'
+				if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 400:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] += (<<ARGS[2]>>)'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 1300:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']+<<ARGS[2]>> - 400)/3'
+				elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] + <<ARGS[2]>>') < 3100:
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+				else
+					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+				end
 			end
 		end
 		if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>''] = 0'
@@ -274,7 +292,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(25,60)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/6'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/6') < 1000:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/6'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/6 -1000)*3)/5'
+					end
 				end
 			elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local'']') > 400:
 				if $ARGS[2] = 'tiny':
@@ -294,7 +316,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(50,100)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/3'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/3') < 700:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>/3') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/3 -700)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+					end
 				end
 			else
 				if $ARGS[2] = 'tiny':
@@ -314,7 +342,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += rand(150,250)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += <<ARGS[2]>>'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 400:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] += (<<ARGS[2]>>)'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local'']+<<ARGS[2]>> - 400)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] + <<ARGS[2]>>') < 3100:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_local''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+					end
 				end
 			end
 		else
@@ -356,7 +392,11 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(25,60)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/6'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/6') < 1000:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/6'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/6 -1000)*3)/5'
+					end
 				end
 			elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core'']') > 400:
 				if $ARGS[2] = 'tiny':
@@ -376,7 +416,13 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(50,100)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/3'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/3') < 700:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>/3') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 700 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/3 -700)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + (((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>>/3 -700)/2 -300)*3)/5'
+					end
 				end
 			else
 				if $ARGS[2] = 'tiny':
@@ -396,7 +442,15 @@ if $ARGS[0] = 'city' or $ARGS[0] = 'pav' or $ARGS[0] = 'pushkin' or $ARGS[0] = '
 				elseif $ARGS[2] = 'bronzemedal':
 					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += rand(150,250)'			
 				else
-					dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += <<ARGS[2]>>'
+					if dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 400:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] += (<<ARGS[2]>>)'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 1300:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 400 + (fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core'']+<<ARGS[2]>> - 400)/3'
+					elseif dyneval('RESULT = fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] + <<ARGS[2]>>') < 3100:
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 700 + ((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>> - 400)/3 - 300)/2'
+					else
+						dynamic 'fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] = 1000 + ((((fame[''<<$ARGS[0]>>_<<$ARGS[1]>>_core''] +<<ARGS[2]>> - 400)/3 -300)/2 - 300)*3)/5'
+					end
 				end
 			end
 		end

locations/gdksex.qsrc

@@ -1618,7 +1618,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1648,7 +1648,7 @@ if $ARGS[0] = 'heating_up':
 						gs 'willpower', 'exhib', 'resist', 'easy'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pav_train'
+						gt 'pav_market'
 					end
 				else
 					act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1669,7 +1669,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1716,7 +1716,7 @@ if $ARGS[0] = 'heating_up':
 									gs 'willpower', 'prostitution', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pav_train'
+									gt 'pav_market'
 								end
 							else
 								act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2226,7 +2226,7 @@ if $ARGS[0] = 'End':
 	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the hotel': gt 'pav_train'
+	act 'Leave the hotel': gt 'pav_market'
 end
 
 if $ARGS[0] = 'drug_user':
@@ -2342,7 +2342,7 @@ if $ARGS[0] = 'drugs':
 								gs 'arousal', 'end'
 								pcs_horny += 100
 								gs 'stat'
-								act 'Leave the room': gt 'pav_train'
+								act 'Leave the room': gt 'pav_market'
 							end
 						end
 					end
@@ -2363,7 +2363,7 @@ if $ARGS[0] = 'drugs':
 			'You try to excuse yourself, saying that it wasn''t your intention to lead him on...'
 			'<<$npc_firstname[$boy]>> stops for a moment and you notice that he''s clearly affected by the drugs. His eyes flare up as he leaps from the chair, shouting that you''re just some whore that was after his drugs.'
 			'He grabs hold of you and shoves you over to the door, throwing you outside. You stand in shock as the drugs take hold of you and you feel yourself becoming incredibly aroused. You knock on the door, but <<$npc_firstname[$boy]>> refuses to open it. You decide to leave... maybe you''ll get lucky somewhere else.'
-			act 'Leave the hotel': gt 'pav_train'
+			act 'Leave the hotel': gt 'pav_market'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2376,7 +2376,7 @@ if $ARGS[0] = 'no drugs':
 	'"There''s no way I''m doing that! Who knows what that powder is and I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$boy]>> snorts deeply and looks over at you. "Too bad, you''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$boy]>> just shrugs his shoulders and jumps straight back into what he started.'
-	act 'Leave the room': gt 'pav_train'
+	act 'Leave the room': gt 'pav_market'
 end
 
 --- gdksex ---------------------------------

locations/gkafe.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = '':
 	*nl
 	'A small shabby cafe attached to the train station. It''s closed right now, but is usually open between 08:00 and 20:00.'
 
-	act 'Leave':gt 'pav_train'
+	act 'Leave':gt 'pav_market'
 
 	if momloc = 9 and hour = 16 and indorf = 0 and mother_go = 1:
 		*clr & cla
@@ -56,13 +56,13 @@ if $ARGS[0] = '':
 					*nl
 					'The cafe owner abruptly pulls his cock out of your mother''s mouth, a string of saliva still attached to it as he roughly pulls her up and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing to comply with his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately shoves his cock into her pussy. His thrusting is fast and furious and you figure that he doesn''t intend to do this much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as her pussy is roughly pounded by her boss. A few minutes later, he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates before she sees you.'
 
-					act 'Leave':gt 'pav_train'
+					act 'Leave':gt 'pav_market'
 				end
-				act 'You''ve seen enough':gt 'pav_train'
+				act 'You''ve seen enough':gt 'pav_market'
 			end
-			act 'You''ve seen enough':gt 'pav_train'
+			act 'You''ve seen enough':gt 'pav_market'
 		end
-		act 'You''ve seen enough':gt 'pav_train'
+		act 'You''ve seen enough':gt 'pav_market'
 	else
 		if hour >= 8 and hour <= 19:
 			*clr & cla
@@ -70,7 +70,7 @@ if $ARGS[0] = '':
 			*nl
 			'A small shabby cafe attached to the train station.'
 
-			act 'Leave':gt 'pav_train'
+			act 'Leave':gt 'pav_market'
 			
 			gs 'gkafe', 'menu'
 

locations/hotel_resep.qsrc

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

locations/olutaxi.qsrc

@@ -189,7 +189,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			'You shake your head no. "No I just wanted to talk is all, get to know you. Maybe some other time."'
 			*nl
 			'He nods but seems to have lost a lot of interest, the two of you talk for a bit but he seems a bit distracted. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he starts to walk off and then stops. "If you want come see me at the University dorms if you are ever in the city." He tells you which dorm building and room is his, then tells you bye as he heads back towards the train station.'
-			act 'Leave':minut += 3 & gt 'pav_train'
+			act 'Leave':minut += 3 & gt 'pav_train_hall'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 				'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. The two of you talk for a bit but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train'
+				act 'Leave':minut += 3 & gt 'pav_train_hall'
 			end
 		else
 			act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'djibril_taxi_sex':
 					'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. Once you are dressed you open the door and climb out. "Sorry." You tell him as you get out and walk away. He gets out behind and closes the door as you walk away.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -376,7 +376,7 @@ if $ARGS[0] = 'djibril_taxi_sex_anal1':
 		gs 'cum_call', 'butt', 'A82'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train'
+		act 'Leave':minut += 3 & gt 'pav_train_hall'
 	end
 end
 	
@@ -403,7 +403,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 		'You nod to him. "Sure maybe another day." Then you walk off.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train'
+		act 'Leave':minut += 3 & gt 'pav_train_hall'
 	end
 	act 'Blow him':
 		*clr & cla
@@ -446,7 +446,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 						gs 'cum_call', 'mouth', 'A55'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':minut += 3 & gt 'pav_train'
+						act 'Leave':minut += 3 & gt 'pav_train_hall'
 					end
 				end
 			else
@@ -489,7 +489,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 							gs 'cum_call', 'mouth', 'A55'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':minut += 3 & gt 'pav_train'
+							act 'Leave':minut += 3 & gt 'pav_train_hall'
 						end
 					end
 				else
@@ -555,7 +555,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end
@@ -583,7 +583,7 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		else
@@ -645,7 +645,7 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train'
+					act 'Leave':minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end

locations/pav_commercial.qsrc

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

locations/pav_disco_sex.qsrc

@@ -1614,7 +1614,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1644,7 +1644,7 @@ if $ARGS[0] = 'heating_up':
 						gs 'willpower', 'exhib', 'resist', 'easy'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'pav_train'
+						gt 'pav_market'
 					end
 				else
 					act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1665,7 +1665,7 @@ if $ARGS[0] = 'heating_up':
 								gs 'willpower', 'prostitution', 'resist', 'hard'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
-								gt 'pav_train'
+								gt 'pav_market'
 							end
 						else
 							act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1712,7 +1712,7 @@ if $ARGS[0] = 'heating_up':
 									gs 'willpower', 'prostitution', 'resist', 'hard'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
-									gt 'pav_train'
+									gt 'pav_market'
 								end
 							else
 								act 'Leave the hotel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2222,7 +2222,7 @@ if $ARGS[0] = 'End':
 	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave the hotel': gt 'pav_train'
+	act 'Leave the hotel': gt 'pav_market'
 end
 
 if $ARGS[0] = 'drug_user':
@@ -2339,7 +2339,7 @@ if $ARGS[0] = 'drugs':
 								gs 'arousal', 'end'
 								pcs_horny += 100
 								gs 'stat'
-								act 'Leave the room': gt 'pav_train'
+								act 'Leave the room': gt 'pav_market'
 							end
 						end
 					end
@@ -2360,7 +2360,7 @@ if $ARGS[0] = 'drugs':
 			'You try to excuse yourself, saying that it wasn''t your intention to lead him on...'
 			'<<$npc_firstname[$npclastsaved]>> stops for a moment and you notice that he''s clearly affected by the drugs. His eyes flare up as he leaps from the chair, shouting that you''re just some whore that was after his drugs.'
 			'He grabs hold of you and shoves you over to the door, throwing you outside. You stand in shock as the drugs take hold of you and you feel yourself becoming incredibly aroused. You knock on the door, but <<$npc_firstname[$npclastsaved]>> refuses to open it. You decide to leave... maybe you''ll get lucky somewhere else.'
-			act 'Leave the hotel': gt 'pav_train'
+			act 'Leave the hotel': gt 'pav_market'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -2373,7 +2373,7 @@ if $ARGS[0] = 'no drugs':
 	'"There''s no way I''m doing that! Who knows what that powder is and I don''t want to get raped. Have fun, loser."'
 	'<<$npc_firstname[$npclastsaved]>> snorts deeply and looks over at you. "Too bad, you''ll be missing out on a great party. This is some quality stuff..."'
 	'"I think I''ll be fine, thanks." you retort as you leave the room. <<$npc_firstname[$npclastsaved]>> just shrugs his shoulders and jumps straight back into what he started.'
-	act 'Leave the room': gt 'pav_train'
+	act 'Leave the room': gt 'pav_market'
 end
 
 --- pav_disco_sex ---------------------------------

locations/pav_market.qsrc

@@ -34,9 +34,9 @@ else
 	end
 end
 *nl
-'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_market_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
-'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_market_market'', ''start''">market</a> on most days.'
+'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
@@ -269,13 +269,13 @@ end
 
 gs 'family'
 
-act 'Enter the station building': minut += 3 & gt 'pav_market_hall'
+act 'Enter the station building': minut += 3 & gt 'pav_train_hall'
 act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
 if Trainpass_day > daystart:
-	act 'Board train (0:15)':minut += 15 & gt 'pav_market_hall', 'platform'
+	act 'Board train (0:15)':minut += 15 & gt 'pav_train_hall', 'platform'
 end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'

locations/pav_train_hall.qsrc

@@ -353,7 +353,7 @@ if $ARGS[0] = 'centre':
 	'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
 		if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 

locations/pav_train_market.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 			exit
 		end
 		
-		act 'Go back to the station': minut += 3 & gt 'pav_train'
+		act 'Go back to the station': minut += 3 & gt 'pav_market'
 		act 'Wander through the market': gt 'pav_train_market','events'
 		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pav_train_market', 3
 		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pav_train_market', 4
@@ -224,7 +224,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		'The market stalls are empty. The market is only open between 08:00 and 19:00.'
-		act 'Go back to the station': minut += 3 & gt 'pav_train'
+		act 'Leave the market': minut += 3 & gt 'pav_market'
 	end
 end
 

locations/police_station.qsrc

@@ -1534,7 +1534,7 @@ if $ARGS[0] = 'rape_report':
 						'With that, you conclude the interview and are led to the front door.'
 						'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you."'
 						'And then he walks away. Leaving you so very alone...'
-						act'Leave':gt'pav_train'
+						act'Leave':gt'pav_market'
 					end
 					act'Can I get a rape kit?':
 						minut += rand(2,5)
@@ -1553,7 +1553,7 @@ if $ARGS[0] = 'rape_report':
 							'"We''ll take this information into consideration. Again, we''re very sorry for what happened to you." And then he walks away.' 
 							*nl
 							'Leaving you alone with your thoughts and memories of your rape...'
-							act'Leave':gt'pav_train'
+							act'Leave':gt'pav_market'
 						end
 					end
 				end

locations/set_home.qsrc

@@ -29,7 +29,7 @@ elseif curr_home = 5:
 elseif curr_home = 6:
 	$home_name = 'My hotel room in Pavlovsk'
 	$home_town = 'pavlovsk'
-	$home_location = 'pav_train'
+	$home_location = 'pav_market'
 	$home_entrance = 'HotelHole'
 elseif curr_home = 7:
 	$home_name = 'Nicholas'' Apartment'

locations/succubus.qsrc

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

locations/train.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'communal_centre':
 	'After 15 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 
@@ -248,7 +248,7 @@ if $ARGS[0] = 'village_centre':
 	'After 25 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'city_train', 'inside'
+		gt 'city_train', 'start'
 	end
 end
 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'weed':
 				'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 				act 'Get off the train':
 					if rand(1, 100) <= 5: gt 'train_incidental', 'events'
-					gt 'city_train', 'inside'
+					gt 'city_train', 'start'
 				end
 			end
 		end
@@ -387,7 +387,7 @@ if $ARGS[0] = 'weed':
 					'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 					act 'Get off the train':
 						if rand(1, 100) <= 5: gt 'train_incidental', 'events'
-						gt 'city_train', 'inside'
+						gt 'city_train', 'start'
 					end
 				end
 			end		
@@ -444,7 +444,7 @@ if $ARGS[0] = 'weed':
 								'After 40 minutes, the train stops at the St. Petersburg city center station. The large office blocks and shopping centers fill your view. This is the train''s final destination.'
 								act 'Get off the train':
 									if rand(1, 100) <= 5: gt 'train_incidental', 'events'
-									gt 'city_train', 'inside'
+									gt 'city_train', 'start'
 								end
 							end
 						end