Merge remote-tracking branch 'Anya/master'

locations/HotelHole.qsrc

@@ -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/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/pav_commercial.qsrc

@@ -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_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.'
 

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