ソースを参照

[fixes] removed unnecessary dynamics in vokdin
[fixes] moved the leave option in the metro and all train stations to the top to make it more consistent
[merge] vokzaltoilet, vokzaltorg, vokmantoiev, vokdin merged into pavtrainhall_events
[merge] vokzalG, vokzalper, vokzaltoilet merged into vokzalholle
[merge] vokzalperG into vokzalGin
[changed] [renamed] renamed several files to make them consistent with train, citytrain, pavcommercial, pavresidential and the new merged file pavtrainhall_events
- vokzalG renamed into pavtrain
- vokzalGin renamed into pavtrainhall
- grinok renamed into pavtrain_market
- vokbimbo renamed into trainbimbo
- vokzalholle renamed into nordtrain
[changed] [fixes] changed all links in other locations to match the new renamed locations

julzor 5 年 前
コミット
090b9de38a

+ 6 - 13
glife.qproj

@@ -655,17 +655,10 @@
 		<Location name="volAndGev"/>
 	</Folder>
 	<Folder name="Station Campus">
-		<Location name="vokzalG"/>
-		<Location name="Grinok"/>
-		<Location name="vokzalGin"/>
-		<Location name="vokdin"/>
-		<Location name="vokdinvera"/>
-		<Location name="vokmantoiev"/>
-		<Location name="vokzaltorg"/>
-		<Location name="vokzalper"/>
-		<Location name="vokzalperG"/>
-		<Location name="vokzaltoilet"/>
-		<Location name="vokzalholle"/>
+		<Location name="pavtrain"/>
+		<Location name="pavtrainhall"/>
+		<Location name="pavtrainhall_events"/>
+		<Location name="pavtrain_market"/>
 		<Location name="katalkin"/>
 		<Location name="katalkinSex"/>
 		<Location name="katalkinAlko"/>
@@ -776,6 +769,7 @@
 	</Folder>
 	<Folder name="North Side">
 		<Location name="Nord"/>
+		<Location name="nordtrain"/>
 		<Location name="Terminal"/>
 		<Location name="TerminalOffice"/>
 		<Location name="ivanRoom"/>
@@ -790,7 +784,6 @@
 		<Location name="LCporn"/>
 		<Location name="LCwork"/>
 		<Location name="pirsingsalon"/>
-		<Location name="vokzal"/>
 		<Location name="obekt"/>
 		<Location name="obekt2"/>
 		<Location name="dangeon"/>
@@ -998,7 +991,7 @@
 	</Folder>
 	<Folder name="Etogame">
 		<Location name="etoexhib"/>
-		<Location name="vokBimbo"/>
+		<Location name="trainBimbo"/>
 		<Location name="parkBimbo"/>
 		<Location name="ptu_dush"/>
 		<Location name="nastja"/>

+ 2 - 2
locations/HotelHole.qsrc

@@ -25,7 +25,7 @@ if hour = 0 and $prevloc ! 'HotelRoom':
 		hotresepQW = 2
 		observ_exp += 3
 	end
-	act 'Go back to the High Street':minut += 3 & gt'vokzalG'
+	act 'Go back to the High Street':minut += 3 & gt'pavtrain'
 	exit
 end
 if hour = 0 and $prevloc = 'HotelRoom':
@@ -124,7 +124,7 @@ if hotwait = 1:
 hotwait = 0
 end
 
-act 'Leave the hotel':minut += 3 & gt'vokzalG'
+act 'Leave the hotel':minut += 3 & gt'pavtrain'
 
 if maidqw >= 1 and hour >= 16 and hour < 17:
 	act'<b>Work as a maid</b>':

+ 1 - 1
locations/Nord.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = '':
 
 	if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 
-	'<a href="exec:minut += 15 & gt ''vokzal''">Train Station</a> to get to the small Town.'
+	'<a href="exec:minut += 15 & gt ''nordtrain'', ''outside''">Train Station</a> to get to the small Town.'
 
 	if week = 3 or hour < 16:
 		'The Bar "Rabotnik" is here, but it seems to be closed. A sign by the door tells you that it''s open every day (except Wednesday) between 16:00 and 24:00.'

+ 4 - 4
locations/arturQW.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'arturQW_1':
 			'Excitedly Arthur comes over and gives your ass a hard squeeze, his fingers sinking into your plump flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek. "Now that the business is settled, let''s go eat barbecue, drink Chacha brandy!" He declares happily.'
 
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 		act 'Refuse':
 			cls
@@ -34,7 +34,7 @@ if $ARGS[0] = 'arturQW_1':
 			'"As you like beautiful." He responds somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze, his fingers sinking into your soft flesh. You moan lightly, feeling him taking a sense of ownership over your body as he grips your butt cheek.'
 
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	else
 		cls
@@ -43,7 +43,7 @@ if $ARGS[0] = 'arturQW_1':
 		'Arthur smiles kindly and hands you a tangerine. "Come to eat barbecue, drink Chacha brandy!"'
 
 		act 'Go with Arthur':gt 'arturHome'
-		act 'Leave':gt 'Grinok', 'start'
+		act 'Leave':gt 'pavtrain_market', 'start'
 	end
 end
 
@@ -82,7 +82,7 @@ if $ARGS[0] = 'arturQW_2':
 		'"As you like beautiful." He said somewhat sadly before adding. "Ah forget it, now let''s go eat barbecue, drink Chacha brandy." He says as he grabs you by your ass and gives it a squeeze.'
 
 		act 'Go with Arthur':gt 'arturHome'
-		act 'Leave':gt 'Grinok', 'start'
+		act 'Leave':gt 'pavtrain_market', 'start'
 	end
 end
 

+ 6 - 6
locations/arturRinok.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 				'Sensing the man has "other" intentions, you start to refuse and back away from the Armenian. He puts his hand out to stop your retreat and says "Hey, I mean no offense. Perhaps my Russian is no good. Nothing bad will happen I swear! I''ll even give you <<$arturgift>> if you come and spend some time with me."'
 
-				act 'Leave':gt 'Grinok', 'start'
+				act 'Leave':gt 'pavtrain_market', 'start'
 
 				act 'Show interest':
 					cls
@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 					'You can''t help but show interested in the gift the unfamiliar Armenian is offering. Suddenly another Armenian comes up to you and leans in with an equally friendly smile. "Do not fear girl, Uncle Arturik does not bite. He is good man." The second stranger insists.'
 
-					act 'Leave':gt 'Grinok', 'start'
+					act 'Leave':gt 'pavtrain_market', 'start'
 					act 'Go with Arthur':gt 'arturHome'
 				end
 			end
@@ -55,12 +55,12 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/artur.jpg"></center>'
 				'Arthur smile amiably you. "There is much work to do, I''m sorry."'
 
-				act 'Leave':gt 'Grinok', 'start'
+				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 	end
 
-	act 'Leave':gt 'Grinok', 'start'
+	act 'Leave':gt 'pavtrain_market', 'start'
 end
 if $ARGS[0] = 'work_1':
 	cls
@@ -93,7 +93,7 @@ if $ARGS[0] = 'work_1':
 				'"Well, you know, the sight of your beautiful eyes nearly overwhelm me every time I see them. So does your tight ass." He says, smiling lecherously at you'
 				'You turn and give him a quick shake of your rump before departing.'
 
-				act 'Leave':gt 'Grinok', 'start'
+				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 	end
@@ -131,7 +131,7 @@ if $ARGS[0] = 'work_2':
 			'"Now let''s go eat barbecue and drink Chacha brandy. Then I can grab you by that fine ass of yours." Arthur suggests as he walks over and begins roughly palming your ass.'
 
 			act 'Go with Arthur':gt 'arturHome'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	end
 end

+ 1 - 1
locations/arturkiosk.qsrc

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

+ 6 - 6
locations/carF.qsrc

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

+ 14 - 15
locations/cityTrain.qsrc

@@ -47,6 +47,8 @@ if $ARGS[0] = 'tickets':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg" ></center>'
 
+	act 'Leave the ticket office':minut += 1 & gt 'cityTrain', 'inside'
+	
 	act 'Buy a ticket':
 		cla
 		gs 'cityTrain', 'buy_ticket'
@@ -68,12 +70,13 @@ if $ARGS[0] = 'tickets':
 			Trainpass_day = daystart + 30
 			act 'Return': gt 'cityTrain', 'inside'
 		end
-	end
-
-	act 'Leave the ticket office':minut += 1 & gt 'cityTrain', 'inside'
+	end	
 end
 
 if $ARGS[0] = 'buy_ticket':
+	
+	act 'Leave the ticket office': minut += 1 & gt 'cityTrain', 'inside'
+	
 	act 'Buy a ticket to the city industrial area (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -83,7 +86,6 @@ if $ARGS[0] = 'buy_ticket':
 		end
 	end
 
-	
 	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -102,7 +104,6 @@ if $ARGS[0] = 'buy_ticket':
 		end
 	end
 
-	
 	act 'Buy a ticket to the old town (125 <b>₽</b>)':
 		if money >= 125:
 			money -= 125
@@ -120,8 +121,6 @@ if $ARGS[0] = 'buy_ticket':
 			'You don''t have enough money for this ticket.'		
 		end
 	end
-
-	act 'Leave the ticket office': minut += 1 & gt 'cityTrain', 'inside'
 end
 
 if $ARGS[0] = 'platform':
@@ -130,6 +129,8 @@ if $ARGS[0] = 'platform':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzalper.jpg" ></center>'
 	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying shopping bags. It feels like it is always busy here, no matter at what time of the day it is.'
 
+	act 'Return to the station hall':gt 'cityTrain', 'inside'
+	
 	act 'Take a train to the city industrial area': gt 'cityTrain', 'ind'
 
 	act 'Take a train to the old platform by the communal village': gt 'cityTrain', 'communal'
@@ -139,13 +140,11 @@ if $ARGS[0] = 'platform':
 	act 'Take a train to the old town': gt 'cityTrain', 'oldtown'
 
 	act 'Take a train to Pavlovsk': gt 'cityTrain', 'pavlovsk'
-
-	act 'Return to the station hall':gt 'cityTrain', 'inside'
 end
 
 if $ARGS[0] = 'ind':
-	$loc = 'vokzalholle'
-	$metka = ''
+	$loc = 'nordtrain'
+	$metka = 'platform'
 	minut += 5
 	gs 'stat'
 	if rand(1, 100) < 15: gt 'train', 'private'
@@ -155,7 +154,7 @@ if $ARGS[0] = 'ind':
 	'After 5 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalholle'
+		gt 'nordtrain', 'platform'
 	end
 end
 
@@ -207,8 +206,8 @@ if $ARGS[0] = 'oldtown':
 end
 
 if $ARGS[0] = 'pavlovsk':
-	$loc = 'vokzalperG'
-	$metka = ''
+	$loc = 'pavtrainhall'
+	$metka = 'platform'
 	minut += 40
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
@@ -220,7 +219,7 @@ if $ARGS[0] = 'pavlovsk':
 	'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalperG'
+		gt 'pavtrainhall', 'platform'
 	end
 end
 

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -1120,7 +1120,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 'vokzalG'
+								act 'Continue': minut += 45 & gt 'pavtrain'
 							end
 						end
 					end

+ 1 - 1
locations/dort.qsrc

@@ -8,7 +8,7 @@ minut += 60
 
 !'<a href="exec:GT ''nowostreet'',''start''">Buildings</a> '
 
-act 'Head to the station':gt 'vokzalholle', ''
+act 'Head to the station':gt 'nordtrain', 'inside'
 act 'Walk to the lake':gt 'lake', 'start'
 
 --- dort ---------------------------------

+ 3 - 3
locations/etoexhib.qsrc

@@ -1686,7 +1686,7 @@ if $ARGS[0] = 'pos54':
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 			'You bought a fake passport, which claims you are an adult.'
 
-			act 'Leave':gt 'vokzal'
+			act 'Leave': gt 'nordtrain', 'outside'
 		end
 	end
 
@@ -1701,13 +1701,13 @@ if $ARGS[0] = 'pos54':
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 			'You bought a fake diploma.'
 
-			act 'Leave':gt 'vokzal'
+			act 'Leave': gt 'nordtrain', 'outside'
 		end
 	end
 
 	act 'Leave':
 		cls
-		gt 'vokzal'
+		gt 'nordtrain', 'outside'
 	end
 end
 

+ 1 - 1
locations/events.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'snkayf':
 
 	if snkz = 5:
 		hour += 2
-		gt 'vokmantoiev', 'female'
+		gt 'pavtrainhall', 'female'
 	end
 
 	if snkz = 6:

+ 1 - 1
locations/family.qsrc

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

+ 8 - 8
locations/gdksex.qsrc

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

+ 5 - 5
locations/gkafe.qsrc

@@ -56,13 +56,13 @@ if $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/event/momslut2.jpg"></center>'
 					'The cafe owner abruptly pulls his groin away from your mother''s mouth, a string of saliva still attached to his dick as he roughly pulls your mother up by her shoulders and tells her to lean against the wall. You can''t hear them talking but he definitely seems to be in charge, and your mother is all too willing in following up his every demand. Your mother lewdly turns her back to him and gently wiggles her ass, and he immediately drove his cock in her pussy. His thrusting is fast and furious and you figure he doesn''t intend to stay here much longer, knowing he has to open the cafe again before too many people notice. Your mother is moaning loudly as she is getting her pussy roughly pounded by her boss, you can easily hear it despite the window between you and them. And sure enough, a few moments later he grabs her ass as his body spasms, dumping his load deep inside her. Your mother drops to her knees quickly without needing a prompt and cleans him up with her tongue, after which he pulls up his pants and goes to re-open the cafe. Your mother sits on the ground for a while to recuperate, licking her lips with a dreamy look in her eyes. You quickly get off the crates, before she sees you.'
 
-					act 'Go back to the train station':gt 'vokzalG'
+					act 'Go back to the train station':gt 'pavtrain'
 				end
-				act 'Leave, you don''t want to see this':gt 'vokzalG'
+				act 'Leave, you don''t want to see this':gt 'pavtrain'
 			end
-			act 'Leave, it''s probably none of your business':gt 'vokzalG'
+			act 'Leave, it''s probably none of your business':gt 'pavtrain'
 		end
-		act 'Leave, it''s probably none of your business':gt 'vokzalG'
+		act 'Leave, it''s probably none of your business':gt 'pavtrain'
 	else
 		if hour >= 8 and hour <= 19:
 			*clr & cla
@@ -99,8 +99,8 @@ if $ARGS[0] = '':
 					'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting at a table in the far corner, drinking beer.'
 			end
 		end
+		act 'Leave':gt 'pavtrain'
 		if hour >= 8 and hour <= 19:gs 'gkafe', 'menu'
-		act 'Leave':gt 'vokzalG'
 	end
 end
 

+ 1 - 1
locations/gopskver.qsrc

@@ -475,7 +475,7 @@ else
 			'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 			
 			if $prevloc = 'gkafe':
-				act 'Blush and quickly leave the cafe':gt'vokzalG'
+				act 'Blush and quickly leave the cafe':gt'pavtrain'
 			else
 				act 'Blush and keep walking':gt 'gskver', 'start'
 				if BjBeerQW >= 5:act 'Approach the guys':gt'zsoft_gopskverGorSlut','1'

+ 1 - 1
locations/hotel_resep.qsrc

@@ -293,7 +293,7 @@ if $ARGS[0] = 'pavlbar':
 			npc_rel['A217'] = 3
 			fingal = 1
 
-			act'Run away':gt'vokzalG'
+			act'Run away':gt'pavtrain'
 		end
 	end
 	exit

+ 6 - 6
locations/katalkin.qsrc

@@ -35,7 +35,7 @@ if hour >= 8 and hour < 22:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 					'You agree to pay the fine, and put the money on his desk after counting it. He swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-					act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 				end
 			else
 				act 'You can''t pay the fine':
@@ -73,7 +73,7 @@ if hour >= 8 and hour < 22:
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 						'You tell him you will pay the fine after all, and put the money on his desk after counting it. He disappointedly swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-						act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+						act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 					end
 				elseif money < schtraf:
 					'You think to yourself: "I can''t afford to pay the fine. If I have to have sex with him to avoid going to jail, I guess that''s just the way it has to be..."'
@@ -111,7 +111,7 @@ if hour >= 8 and hour < 22:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 					'You see a tinge of regret in his face when you give him the money. "Oh. Very well then, miss <<$pcs_lastname>>. You''re free to go."'
 
-					act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 				end
 			end
 
@@ -196,7 +196,7 @@ elseif hour >= 22:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
 					'You agree to pay the fine, and put the money on his desk after counting it. He swipes the money away, putting it in a box before he returns to his duties. As far as he''s concerned, you''re no longer there.'
 
-					act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+					act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 				end
 			else
 				act 'You can''t pay the fine':
@@ -219,10 +219,10 @@ elseif hour >= 22:
 elseif hour < 8:
 	'The door to the police station is locked.'
 
-	act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+	act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 end
 
-if katalkinNoexit = 0:act 'Leave the police station':minut += 1 & gt 'vokzalGin'
+if katalkinNoexit = 0:act 'Leave the police station':minut += 1 & gt 'pavtrainhall'
 
 --- katalkin ---------------------------------
 

+ 2 - 2
locations/katalkinAlko.qsrc

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

+ 1 - 1
locations/korr.qsrc

@@ -188,7 +188,7 @@ if IvanPodstavaQW = 3 and hour >= 9 and hour <= 20:
 
 			'Time dragged on too long. Your life and work was tedious and monotonous. You sewed quilted five years, had dinner in the dining room and went to sleep in the barracks surrounded by other women inmates. With your salary of 2, 000 <b>₽</b> per month in 1000 listed on the debt repayment. But time does not stand still and still came an end to your suffering. You let go and gave 2,000 <b>₽</b>. You took the train and came back to the city.'
 
-			act 'Get off the train':gt 'vokzal'
+			act 'Get off the train': gt 'nordtrain', 'outside'
 		end
 	end
 	exit

+ 1 - 1
locations/korr2x.qsrc

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

+ 1 - 1
locations/kutuzka.qsrc

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

+ 5 - 5
locations/metro.qsrc

@@ -41,6 +41,11 @@ if $ARGS[0] = 'start':
 		if badrand >= 80:konvert = 0
 	end
 
+	act 'Leave the Metro station':
+		minut += 5
+		gt $loc, $metka
+	end
+	
 	if money >= 16:
 		if $loc ! 'street':
 			act 'Go to the <b>Residential Area</b> (16 <b>₽</b>)':
@@ -87,11 +92,6 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-
-	act 'Leave the Metro station':
-		minut += 5
-		gt $loc, $metka
-	end
 	
 	if pusher = 1 and dealer = 0:
 		dealer = 1

+ 106 - 22
locations/vokzalholle.qsrc → locations/nordtrain.qsrc

@@ -1,6 +1,6 @@
-# vokzalholle
+# nordtrain
 
-if $ARGS[0] = '':
+if $ARGS[0] = 'inside':
 	$metka = $ARGS[0]
 	$loc = $CURLOC
 	$location_type = 'public_indoors'
@@ -10,15 +10,98 @@ if $ARGS[0] = '':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalholle.jpg" ></center>'
 	'There is a <a href="exec:GT ''dort''">path</a> leading off in to the distance, in the direction of the lake.'
-	act 'Leave the station building': minut += 2 & gt 'vokzal'
+	act 'Leave the station': minut += 2 & gt 'nordtrain', 'outside'
 	*nl
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to the platforms': gt 'vokzalper'
+		act 'Go to the platforms': gt 'nordtrain', 'platform'
 	else
-		act 'Go to the ticket office': minut += 1 & gt 'vokzalholle', 'ticket'
+		act 'Go to the ticket office': minut += 1 & gt 'nordtrain', 'ticket'
 	end
-	act 'Go to the restrooms': minut += 1 & gt 'vokzaltoilet'
+	act 'Go to the restrooms': minut += 1 & gt 'nordtrain', 'toilet'
+end
+
+if $ARGS[0] = 'outside':
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'public_outdoors'
+	cls
+	gs'stat'
+	'<center><B>Railway station</B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+
+	if car > 0 and cardrive = 19:
+		cardrive = 19
+		'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
+	end
+
+	if RAND(1,100) > 70:
+		'You see a <a href="exec:GT ''etoexhib'',''pos54''">suspicious character</a>.'
+		!fakes use 2 for aware of need for, 1 for have, otherwise 0
+		if fakepassport = 2 or fakediplom = 2:
+		'When you pass by the suspicious character, he whispers to you: "I have what you want, miss"'
+		end
+	end
+
+	act 'Go to the city industrial region': minut += 15 & gt'nord'
+	act 'Enter the station building': minut += 2 & gt'nordtrain', 'inside'
+end
+
+if $ARGS[0] = 'platform':
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'public_outdoors'
+	cls
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzalper.jpg" ></center>'
+	'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying large bags. It feels like it is always busy here, no matter at what time of the day you are here.'
+
+	act 'Return to the station': minut += 5 & gt 'nordtrain', 'inside'
+	
+	if Trainpass_day > daystart:
+		act 'Take a train to the city center': gt 'nordtrain', 'centre'
+		
+		act 'Take a train to the old platform by the communal village': gt 'nordtrain', 'communal'
+		
+		act 'Take a train to the village of Gadukino': gt 'nordtrain', 'village'
+		
+		act 'Take a train to the old town': gt 'nordtrain', 'oldtown'
+		
+		act 'Take a train to Pavlovsk': gt 'nordtrain', 'pavlovsk'
+	end
+end
+
+if $ARGS[0] = 'toilet':
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'bathroom'
+	
+	*clr & cla
+	gs'stat'
+
+	if night_mode = 1:
+		fcolor = rgb(255, 255, 255)
+		bcolor = rgb(0, 0, 0)
+		lcolor = rgb(106, 90, 205)
+	else
+		fcolor = rgb(0, 0, 0)
+		bcolor = rgb(255, 255, 255)
+		lcolor = rgb(106, 90, 205)
+	end
+
+	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
+
+	act 'Return to the station': minut += 1 & gt 'nordtrain', 'inside'
+
+	act 'Look in the mirror': gt 'mirror', 'start'
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+	dynamic $removepan
 end
 
 if $ARGS[0] = 'ticket':
@@ -27,10 +110,12 @@ if $ARGS[0] = 'ticket':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg"></center>'
 
+	act 'Leave the ticket office':minut += 1 & gt 'nordtrain', 'inside'
+	
 	if money >= 50:
 		act 'Buy a ticket':
 			cla
-			gs 'vokzalholle', 'buy_ticket'
+			gs 'nordtrain', 'buy_ticket'
 		end
 	end
 
@@ -39,7 +124,7 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'vokzalholle', ''
+			act 'Return': gt 'nordtrain', 'inside'
 		end
 	end
 
@@ -48,50 +133,49 @@ if $ARGS[0] = 'ticket':
 			cla
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'vokzalholle', ''
+			act 'Return': gt 'nordtrain', 'inside'
 		end
 	end
-
-	act 'Leave the ticket office':minut += 1 & gt 'vokzalholle', ''
 end
 
 if $ARGS[0] = 'buy_ticket':
+	
+	act 'Leave the ticket office': gt 'nordtrain', 'inside'
+	
 	if money >= 50:
 		act 'Buy a ticket to the city center (50 <b>₽</b>)':
 			money -= 50
-			gt 'vokzalholle', 'centre'
+			gt 'nordtrain', 'centre'
 		end
 	end
 
 	if money >= 50:
 		act 'Buy a ticket to the old platform by the communal village (50 <b>₽</b>)':
 			money -= 100
-			gt 'vokzalholle', 'communal'
+			gt 'nordtrain', 'communal'
 		end
 	end
 
 	if money >= 75:
 		act 'Buy a ticket to the village of Gadukino (75 <b>₽</b>)':
 			money -= 75
-			gt 'vokzalholle', 'village'
+			gt 'nordtrain', 'village'
 		end
 	end
 
 	if money >= 100:
 		act 'Buy a ticket to the old town (100 <b>₽</b>)':
 			money -= 100
-			gt 'vokzalholle', 'oldtown'
+			gt 'nordtrain', 'oldtown'
 		end
 	end
 
 	if money >= 125:
 		act 'Buy a ticket to Pavlovsk (125 <b>₽</b>)':
 			money -= 125
-			gt 'vokzalholle', 'pavlovsk'
+			gt 'nordtrain', 'pavlovsk'
 		end
 	end
-	
-	act 'Leave the ticket office': gt 'vokzalholle', ''
 end
 
 if $ARGS[0] = 'centre':
@@ -155,8 +239,8 @@ if $ARGS[0] = 'oldtown':
 end
 
 if $ARGS[0] = 'pavlovsk':
-	$loc = 'vokzalperG'
-	$metka = ''
+	$loc = 'pavtrainhall'
+	$metka = 'platform'
 	minut += 35
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
@@ -167,9 +251,9 @@ if $ARGS[0] = 'pavlovsk':
 	'After 35 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalperG'
+		gt 'pavtrainhall', 'platform'
 	end
 end
 
---- vokzalholle ---------------------------------
+--- nordtrain ---------------------------------
 

+ 1 - 1
locations/pavCommercial.qsrc

@@ -94,7 +94,7 @@ else
 	$Pharmname = '.'
 end
 
-'You are on the high street, at one end is the <a href="exec:minut += 15 & gt ''vokzalG''">train station</a> and access to the highway. Near the highway you can also find a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a>.'
+'You are on the high street, at one end is the <a href="exec:minut += 15 & gt ''pavtrain''">train station</a> and access to the highway. Near the highway you can also find a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a>.'
 '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>.'
 'There is a small <a href="exec:minut += 5 & gt ''gpoli''">clinic</a><<$Pharmname>>'
 

+ 5 - 5
locations/vokzalG.qsrc → locations/pavtrain.qsrc

@@ -1,4 +1,4 @@
-# vokzalG
+# pavtrain
 $metka = $ARGS[0]
 $loc = $CURLOC
 $location_type = 'public_outdoors'
@@ -17,8 +17,8 @@ clr
 gs 'stat'
 '<center><h4>Pavlovsk''s train station</h4></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
-'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''vokzalGin''">train station</a>, in which you can find Pavlovsk''s police station, and a post office. Also attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '.'
-'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''Grinok'', ''start''">market</a> on most days.'
+'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>, in which you can find Pavlovsk''s police station, and a post office. Also attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '.'
+'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pavtrain_market'', ''start''">market</a> on most days.'
 'Pavlovsk''s only and rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. You know they''re often looking for maids.'
 
 if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0:
@@ -151,9 +151,9 @@ end
 
 gs 'family'
 
-act 'Enter station': gt 'vokzalGin'
+act 'Enter the train station': gt 'pavtrainhall'
 act 'Go to Pavlovsk high street':minut += 15 & gt 'pavCommercial'
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 
---- vokzalG ---------------------------------
+--- pavtrain ---------------------------------
 

+ 89 - 89
locations/Grinok.qsrc → locations/pavtrain_market.qsrc

@@ -1,4 +1,4 @@
-# Grinok
+# pavtrain_market
 
 !{change log
 March 31, 2016
@@ -25,13 +25,13 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><h4>Market</h4></center>'
 	if month >= 11 or month <= 3:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinokw.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pavtrain_marketw.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinok.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pavtrain_market.jpg"></center>'
 	end
 	'This small open air market is located near the train station.'
 	if arturQW = 1 and (week = 6 or week = 7) and hour < 12:
-		act 'Wait for Aurel to arrive':hour = 12 & gt 'Grinok', 'start'
+		act 'Wait for Aurel to arrive':hour = 12 & gt 'pavtrain_market', 'start'
 	end
 
 	if hour >= 8 and hour <= 18:
@@ -42,14 +42,14 @@ if $ARGS[0] = 'start':
 			act 'Reject him':
 				cla
 				'You pretend not to understand what he is saying.'
-				act 'Return':gt 'Grinok', 'start'
+				act 'Return':gt 'pavtrain_market', 'start'
 			end
 			
 			exit
 		end
 		
-		act 'Wander through the market': gt 'Grinok','events'
-		act 'Go back to the station': minut += 3 & gt 'vokzalG'
+		act 'Wander through the market': gt 'pavtrain_market','events'
+		act 'Go back to the station': minut += 3 & gt 'pavtrain'
 		
 		!expand market events from 1.2.4
 
@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 			if hour = 16 and minut <= 30:
 				act 'Look for Aurel':gt 'arturRinok', 'work_2'
 			elseif hour < 16:
-				act 'Wait for Aurel to arrive':hour = 16 & minut = 0 & gt 'Grinok', 'start'
+				act 'Wait for Aurel to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
 			end
 		end
 
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 				gs'stat'
 				'You stand quietly by the entrance to the market, waiting for customers and displaying your tapestries. Shortly buyers start to gather, but a large, muscular man approaches you and says, "It is illegal to trade in the market without a trader''s license, but I may be interesting in buying your tapestries, 1000 <b>₽</b> apiece. Come and see me at my stall."'
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went and he should be easy to find.'
-				act 'Leave':gt 'Grinok', 'start'
+				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 
@@ -99,7 +99,7 @@ if $ARGS[0] = 'start':
 					money += 1000
 					gs'stat'
 					'You show your tapestry to Roman and he gives you five hundred for it. You take the money and give him the tapestry.'
-					act 'Leave':gt 'Grinok', 'start'
+					act 'Leave':gt 'pavtrain_market', 'start'
 				end
 				if gobelen > 1:
 					act'Sell all of your tapestries':
@@ -110,10 +110,10 @@ if $ARGS[0] = 'start':
 						money += moneyGob
 						gs'stat'
 						'You show Roman your tapestries and he gives you <<moneyGob>> <b>₽</b> for them. You take the money and give him the tapestries.'
-						act 'Leave':gt 'Grinok', 'start'
+						act 'Leave':gt 'pavtrain_market', 'start'
 					end
 				end
-				act 'Leave':gt 'Grinok', 'start'
+				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 		if ShowerIvan = 5 and porndeal = 0 and rand(1,10) <= 4 and lookwine ! daystart:
@@ -147,11 +147,11 @@ if $ARGS[0] = 'start':
 						money -= 500
 						ricewine = 1
 						'You hand the woman the money and she gives you the wine.'
-						act 'Leave': gt 'Grinok', 'start'
+						act 'Leave': gt 'pavtrain_market', 'start'
 					end
 				else
 					'You are astonished by the price and realize that you cannot afford the wine. You apologize and turn away.'
-					act 'Leave the market': gt 'Grinok', 'start'
+					act 'Leave the market': gt 'pavtrain_market', 'start'
 					act 'Continue browsing the market':
 						cls
 						cla
@@ -163,10 +163,10 @@ if $ARGS[0] = 'start':
 						'"Yes," you answered him, "But it costs too much. I can''t afford it."'
 						'"I''ll make a deal with you." he said, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
 						if pornmarkonce = 0: pornmarkonce = 1 & '"Where is the porn dealer?" you asked and he gives you directions.'
-						act 'Agree': porndeal = 1 & gt 'Grinok', 4
+						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
 						act 'Refuse':
 							'You declined his offer and he shrugged and walked away.'
-							act 'Leave': gt 'Grinok', 'start'
+							act 'Leave': gt 'pavtrain_market', 'start'
 						end
 					end
 				end
@@ -177,12 +177,12 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			lookwine = daystart
 			if month >= 11 or month <= 3:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinokw.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pavtrain_marketw.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinok.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pavtrain_market.jpg"></center>'
 			end
 			'You look around the market, but the Chinese vendors don''t seem to be here today.'
-			act 'Leave': gt 'Grinok', 'start'
+			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 		if porndeal = 1 and porndealday ! daystart:
 			cls 
@@ -198,10 +198,10 @@ if $ARGS[0] = 'start':
 				ricewine = 1
 				'"Do you have the wine?" you countered.'
 				'He pulls the bottle out of his backpack and you trade items.'
-				act 'Leave': gt 'Grinok', 'start'
+				act 'Leave': gt 'pavtrain_market', 'start'
 			else
 				'You told him you didn''t have his magazine yet but you were working on it.'
-				act 'Leave': gt 'Grinok', 'start'
+				act 'Leave': gt 'pavtrain_market', 'start'
 			end 
 		end
 		if porndeal = 1 and porndealday = daystart and lookboy = 0:
@@ -211,11 +211,11 @@ if $ARGS[0] = 'start':
 			lookboy = 1
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
 			'You look around the market for the boy from the Chinese stall, but you can''t find him. You decide to look for him another day.'
-			act 'Leave': gt 'Grinok', 'start'
+			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 	else
-		act 'Wander through the market': gt 'Grinok','events'
-		act 'Go back to the station': minut += 3 & gt 'vokzalG'
+		act 'Wander through the market': gt 'pavtrain_market','events'
+		act 'Go back to the station': minut += 3 & gt 'pavtrain'
 	end
 end
 
@@ -227,25 +227,25 @@ if $ARGS[0] = 'events':
 	gs 'stat'
 	rinevrand = rand(1,19)
 
-	act 'Wander around the market': gt 'Grinok','events'
-	act 'Stop wandering': gt 'Grinok', 'start'
+	act 'Wander around the market': gt 'pavtrain_market','events'
+	act 'Stop wandering': gt 'pavtrain_market', 'start'
 	if rand(0,3) ! 0: 
-		gs 'Grinok', rinevrand
+		gs 'pavtrain_market', rinevrand
 	else
-		$grinok_text[3]='you pass a stall, it is selling children''s clothes.'
-		$grinok_text[4]='you see a woman looking for underwear.'
-		$grinok_text[5]='you notice a half-naked girl trying on clothes.'
-		$grinok_text[6]='you look away as a woman tries on a bra'
-		$grinok_text[7]='you don''t see anything unusual, just the usual vegetables and tasteless clothes.'
-		$grinok_text[8]='you just see old women in dressing gowns and slippers. Stupid crappy market.'
-		$grinok_text[9]='you don''t find anything interesting'
-		$grinok_text[10]='you just see cheap Chinese goods and nothing more.'
-		$grinok_text[11]='you see all the usual stuff. People with bags scurrying back and forth, children begging for toys from their parents and vociferous traders.'
-		$grinok_text[12]='you have to be careful as its so busy. The hustle and bustle makes it hard to find anything worthwhile.'	
+		$pavtrain_market_text[3]='you pass a stall, it is selling children''s clothes.'
+		$pavtrain_market_text[4]='you see a woman looking for underwear.'
+		$pavtrain_market_text[5]='you notice a half-naked girl trying on clothes.'
+		$pavtrain_market_text[6]='you look away as a woman tries on a bra'
+		$pavtrain_market_text[7]='you don''t see anything unusual, just the usual vegetables and tasteless clothes.'
+		$pavtrain_market_text[8]='you just see old women in dressing gowns and slippers. Stupid crappy market.'
+		$pavtrain_market_text[9]='you don''t find anything interesting'
+		$pavtrain_market_text[10]='you just see cheap Chinese goods and nothing more.'
+		$pavtrain_market_text[11]='you see all the usual stuff. People with bags scurrying back and forth, children begging for toys from their parents and vociferous traders.'
+		$pavtrain_market_text[12]='you have to be careful as its so busy. The hustle and bustle makes it hard to find anything worthwhile.'	
 	
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/brodit'+rand(1,8)+'.jpg"></center>'
-		'As you are strolling through the market, ' + $grinok_text[rand(3,12)]
-		killvar '$grinok_text'
+		'As you are strolling through the market, ' + $pavtrain_market_text[rand(3,12)]
+		killvar '$pavtrain_market_text'
 	end
 end
 
@@ -260,7 +260,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
 		'You ignore the begger and pretend not to hear him.'
-		act 'Wander around the market': gt 'Grinok','events'
+		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 	act 'Give some money': 
 		cla
@@ -271,7 +271,7 @@ if ARGS[0] = 1:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
 		'You give the beggar a few rubles'
-		act 'Wander around the market': gt 'Grinok','events'
+		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 end
 
@@ -289,7 +289,7 @@ if ARGS[0] = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/book.jpg"></center>'
 	end
 	'You find a stall selling various books, there are fantasy books, science fiction and romance novels, all of which costs only 350 <b>₽</b> each.'
-	act 'Leave':gt 'Grinok', 'start'
+	act 'Leave':gt 'pavtrain_market', 'start'
 	if money >= 350:
 		act 'Buy a fantasy book (350 <b>₽</b>)':
 			cls
@@ -298,7 +298,7 @@ if ARGS[0] = 3:
 			f_book += 1
 			gs 'stat'
 			'You bought a fantasy book for 350 <b>₽</b>.'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	end
 	if money >= 350:
@@ -309,7 +309,7 @@ if ARGS[0] = 3:
 			f_book += 1
 			gs 'stat'
 			'You bought a science ficiton book for 350 <b>₽</b>.'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	end
 	if money >= 350:
@@ -320,7 +320,7 @@ if ARGS[0] = 3:
 			w_book += 1
 			gs 'stat'
 			'You bought a romance novel for 350 <b>₽</b>.'
-			act 'Leave':gt 'Grinok', 'start'
+			act 'Leave':gt 'pavtrain_market', 'start'
 		end
 	end
 end
@@ -330,7 +330,7 @@ if ARGS[0] = 4:
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
-	act 'Leave':gt 'Grinok', 'start'
+	act 'Leave':gt 'pavtrain_market', 'start'
 	if money >= 699 and card < 2:
 		act 'Buy cards (699 <b>₽</b>)':
 			cls
@@ -342,8 +342,8 @@ if ARGS[0] = 4:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 			'You tried not to look into the eyes of the porn dealer as you counted out the money. You took the cards and quickly put them in your purse.'
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Buy something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 	end
 	if porndeal = 1:
@@ -356,8 +356,8 @@ if ARGS[0] = 4:
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 				'You tried not to look into the eyes of the porn dealer as you counted out the money. You took the magazine and quickly hid it.'
-				act 'Leave':gt 'Grinok', 'start'
-				act 'Buy something else':gt 'Grinok', 4
+				act 'Leave':gt 'pavtrain_market', 'start'
+				act 'Buy something else':gt 'pavtrain_market', 4
 			end
 		end
 	else
@@ -366,23 +366,23 @@ if ARGS[0] = 4:
 			pcs_horny += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Look for something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Look for something else':gt 'pavtrain_market', 4
 			if TimesBuyPorno = 0:
 				'You look over the covers of the magazines, covered in images of half-naked girls on them. Many of them appear to be near your own age. The porn dealer noticed your interest and looks at you expectantly.'
 				act 'Look through a magazine':
 					cla
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'Grinok', 'start'
-					act 'Look for something else':gt 'Grinok', 4
+					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Look for something else':gt 'pavtrain_market', 4
 					act 'Ask for the price':
 						cls
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 						'Blushing profusely right down to your roots, you approach the porn dealer and stammeringly ask him the price on the magazines. The porn dealer smiles at you and says, "All magazines are 400 <b>₽</b> each."'
-						act 'Leave':gt 'Grinok', 'start'
-						act 'Look for something else':gt 'Grinok', 4
+						act 'Leave':gt 'pavtrain_market', 'start'
+						act 'Look for something else':gt 'pavtrain_market', 4
 						if money >= 400:
 							act 'Buy magazine (400 <b>₽</b>)':
 								cls
@@ -393,8 +393,8 @@ if ARGS[0] = 4:
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 								'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-								act 'Leave':gt 'Grinok', 'start'
-								act 'Buy something else':gt 'Grinok', 4
+								act 'Leave':gt 'pavtrain_market', 'start'
+								act 'Buy something else':gt 'pavtrain_market', 4
 							end
 						end
 					end
@@ -404,8 +404,8 @@ if ARGS[0] = 4:
 				act 'Look through a magazine':
 					cla
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'Grinok', 'start'
-					act 'Look for something else':gt 'Grinok', 4
+					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine':
 							cls
@@ -416,8 +416,8 @@ if ARGS[0] = 4:
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-							act 'Leave':gt 'Grinok', 'start'
-							act 'Buy something else':gt 'Grinok', 4
+							act 'Leave':gt 'pavtrain_market', 'start'
+							act 'Buy something else':gt 'pavtrain_market', 4
 						end
 					end
 				end
@@ -426,8 +426,8 @@ if ARGS[0] = 4:
 				act 'Look through a magazine':
 					cla
 					'You pick up one of the magazines and flip through the pages. Inside the magazines, you see men with large erect penis engaging in sexual acts with women who are either half-naked or fully naked, most of them look close to your own age. You feel yourself getting aroused looking at the images.'
-					act 'Leave':gt 'Grinok', 'start'
-					act 'Look for something else':gt 'Grinok', 4
+					act 'Leave':gt 'pavtrain_market', 'start'
+					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
 						act 'Buy magazine':
 							cls
@@ -438,8 +438,8 @@ if ARGS[0] = 4:
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 							'You try not to look into the porn dealers eyes as you hand him the money. You take the magazine and quickly hide it under your shirt.'
-							act 'Leave':gt 'Grinok', 'start'
-							act 'Buy something else':gt 'Grinok', 4
+							act 'Leave':gt 'pavtrain_market', 'start'
+							act 'Buy something else':gt 'pavtrain_market', 4
 						end
 					end
 				end
@@ -451,8 +451,8 @@ if ARGS[0] = 4:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/sextoys.jpg"></center>'
 		'He lets you step behind the counter so you can get a better look, as you do he says. "Take a look and let me know what you would like." You see several 15cm dildos. Each with a tag, "Only 700 <b>₽</b> each." You also see a small selection of vibrators in various colors, mostly pink. "Only 700 <b>₽</b> each." To one side you see many butt plugs, rubber and metal. "Only 700 <b>₽</b>each." Near the bottom is several strapon harnesses. "Only 1000 <b>₽</b>each."'
-		act 'Leave':gt 'Grinok', 'start'
-		act 'Look for something else':gt 'Grinok', 4
+		act 'Leave':gt 'pavtrain_market', 'start'
+		act 'Look for something else':gt 'pavtrain_market', 4
 		act 'Buy dildo (700 <b>₽</b>)':
 			cla
 			if money >= 700 and dildo = 0:
@@ -467,8 +467,8 @@ if ARGS[0] = 4:
 					'You buy a dildo and calmly hide it.'
 				end
 			end
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Buy something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 		act 'Buy vibrator (700 <b>₽</b>)':
 			cla
@@ -484,8 +484,8 @@ if ARGS[0] = 4:
 					'You buy a vibrator and calmly hide it.'
 				end
 			end
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Buy something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 		act 'Buy butt plug (700 <b>₽</b>)':
 			cla
@@ -501,8 +501,8 @@ if ARGS[0] = 4:
 					'You buy a butt plug and calmly hide it.'
 				end
 			end
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Buy something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 		act 'Buy strapon harness (1000 <b>₽</b>)':
 			cla
@@ -518,8 +518,8 @@ if ARGS[0] = 4:
 					'You buy a strapon harness and calmly hide it.'
 				end
 			end
-			act 'Leave':gt 'Grinok', 'start'
-			act 'Buy something else':gt 'Grinok', 4
+			act 'Leave':gt 'pavtrain_market', 'start'
+			act 'Buy something else':gt 'pavtrain_market', 4
 		end
 	end
 end
@@ -551,7 +551,7 @@ if ARGS[0] = 6:
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/okliknut.jpg"></center>'
 				'You search the area hoping to find the thief, but she has already disappeared into the crowd.'
-				act 'Back': gt 'Grinok', 'start'
+				act 'Back': gt 'pavtrain_market', 'start'
 			end
 		end
 	end
@@ -568,7 +568,7 @@ if ARGS[0] = 7:
 			money -= tovpay
 			kosmetica += 50
 			gs 'stat'
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 	end
 end
@@ -583,7 +583,7 @@ if ARGS[0] = 8:
 			minut += 15
 			vitamin += 20
 			money -= tovpay
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 	end
 end
@@ -603,7 +603,7 @@ if ARGS[0] = 9:
 			if i > 0: i-= 1 & jump 'cndmlp'
 			killvar 'i'
 			money -= tovpay
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 	end
 end
@@ -618,7 +618,7 @@ if ARGS[0] = 10:
 			minut += 15
 			lipbalm += 30
 			money -= tovpay
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 	end
 end
@@ -651,7 +651,7 @@ if ARGS[0] = 12:
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/eat.jpg"></center>'
 			'You ate a delicious pie with pleasure.'
-			act 'Continue walking through the market': gt 'Grinok','events'
+			act 'Continue walking through the market': gt 'pavtrain_market','events'
 		end
 	else
 		*p ', But you are not hungry right now.'
@@ -668,7 +668,7 @@ if ARGS[0] = 13:
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vernutwallet.jpg"></center>'
 		'You call to the woman and hold out her wallet. She looks at you and releasing she gratefully takes her wallet back and walks away.'
-		act 'Continue walking through the market': gt 'Grinok','events'
+		act 'Continue walking through the market': gt 'pavtrain_market','events'
 	end
 	act 'Look through the purse':
 		cla
@@ -682,7 +682,7 @@ if ARGS[0] = 13:
 			*clr
 			money += i
 			pcs_mood += 10
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 		act 'Catch up with the woman and return her purse':
 			cla
@@ -690,7 +690,7 @@ if ARGS[0] = 13:
 			pcs_mood += 5
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
-			act 'Continue walking through the market': gt 'Grinok','events'
+			act 'Continue walking through the market': gt 'pavtrain_market','events'
 		end
 	end
 end
@@ -723,8 +723,8 @@ if ARGS[0] = 18:
 		*clr
 		if girl > 1: pcs_horny += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pereodev'+rand(1,15)+'.jpg"></center>'
-		'You look inside the tent and see ' + $grinokrandtext[rand(3,7)]
-		act 'Leave': gt 'Grinok', 'start'
+		'You look inside the tent and see ' + $pavtrain_marketrandtext[rand(3,7)]
+		act 'Leave': gt 'pavtrain_market', 'start'
 	end
 end
 
@@ -755,11 +755,11 @@ if ARGS[0] = 19:
 				end
 			end
 			money -= tovpay
-			gt 'Grinok', 'start'
+			gt 'pavtrain_market', 'start'
 		end
 	end
 end	
 
 
---- Grinok ---------------------------------
+--- pavtrain_market ---------------------------------
 

+ 135 - 36
locations/vokzalGin.qsrc → locations/pavtrainhall.qsrc

@@ -1,15 +1,14 @@
-# vokzalGin
+# pavtrainhall
 
 if $ARGS[0] = '':
 	$metka = ''
-	$loc = 'vokzalGin'
+	$loc = 'pavtrainhall'
 	$location_type = 'public_indoors'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/vokzal2.mp3',30
 	clr
 	frost = 0
 	poezddalsled = 0
-	gs 'vokdin'
 	gs 'stat'
 	if night_mode = 1:
 		fcolor = rgb(255, 255, 255)
@@ -23,7 +22,7 @@ if $ARGS[0] = '':
 
 	'<center><h4>Pavlovsk train station interior</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-	'The center of the station building is a large waiting room, where passengers can wait until their train arrives. Opposite to that you can find the <a href="exec:dynamic $din_vokzalg_kabinet">station manager''s office</a>, and the <a href="exec:minut += 1 & gt ''vokmantoiev'', ''start''">toilets</a> on the other end of the building.'
+	'The center of the station building is a large waiting room, where passengers can wait until their train arrives. Opposite to that you can find the <a href="exec: gt ''pavtrainhall_events'', ''manager''">station manager''s office</a>, and the <a href="exec:minut += 1 & gt ''pavtrainhall'', ''toilet''">toilets</a> on the other end of the building.'
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 
 	*nl
@@ -39,16 +38,17 @@ if $ARGS[0] = '':
 	if podbros = 0:
 		podrand = rand(0, 1)
 
-		if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 0:'As you walk through the station building, you notice a man''s thick <a href="exec:dynamic $din_vokzalg_podbros">wallet</a> dropping from his pocket, not far away from you.'
+		if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 0:'As you walk through the station building, you notice a man''s thick <a href="exec: gt ''pavtrainhall_events'', ''wallet1''">wallet</a> dropping from his pocket, not far away from you.'
 		*nl
 	end
 
-	act 'Leave the station building':minut += 3 & gt 'vokzalG'
+	act 'Leave the station building':minut += 3 & gt 'pavtrain'
+	
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'
-		act 'Go to the platforms': gt 'vokzalperG', 'start'
+		act 'Go to the platforms': gt 'pavtrainhall', 'platform'
 	else
-		act 'Go to the ticket office': gt 'vokzalGin', 'ticket'
+		act 'Go to the ticket office': gt 'pavtrainhall', 'ticket'
 	end
 
 	if snarkozak = 1 and narkossista = 0 and narkozakday!day:
@@ -59,7 +59,7 @@ if $ARGS[0] = '':
 	
 	if vokzalVork >= 1:
 		if cleZalDay ! daystart or cleMTDay ! daystart or cleWTDay ! daystart:
-			act 'Work': gt 'vokzalGin', 'work'
+			act 'Work': gt 'pavtrainhall', 'work'
 		elseif cleZarplatDay ! daystart:
 			act 'Collect your salary':
 				*clr & cla
@@ -71,7 +71,7 @@ if $ARGS[0] = '':
 				minut += 3
 				gs 'stat'
 				'When you are done cleaning all the places you were told to clean, you go to the cashier and collect your well-earned salary.'
-				act 'Continue':minut += 1 & gt 'vokzalGin'
+				act 'Continue':minut += 1 & gt 'pavtrainhall'
 			end
 		end
 	end
@@ -101,13 +101,50 @@ if $ARGS[0] = '':
 		'The platform is bustling with passengers that are entering or leaving the currently waiting train, carrying their heavy bags with them. Several police officers are patrolling the platforms while the train is here, keeping an eye out for any unruly activities.'
 
 		if tovarL > 0:
-			act 'Sell your goods to passengers':gt 'vokzaltorg'
+			act 'Sell your goods to passengers':gt 'pavtrainhall_events', 'trinkets'
 		end
 	end
 	
 	act 'Wait':gs 'obj_din', 'wait'
 end
 
+if $ARGS[0] = 'platform':
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'public_outdoors'
+	CLOSE ALL
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+		else
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
+		end
+	end
+
+	*clr & cla
+	gs'stat'
+
+	'<center><H4>Pavlovsk station platforms</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
+	'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
+
+	act 'Return to the station building': gt'pavtrainhall'
+
+	if Trainpass_day > daystart:
+		act 'Take a train to the old town': gt 'pavtrainhall', 'oldtown'
+	
+		act 'Take a train to the village of Gadukino': gt 'pavtrainhall', 'village'
+	
+		act 'Take a train to the the communal village': gt 'pavtrainhall', 'communal'
+
+		act 'Take a train to city industrial area': gt 'pavtrainhall', 'ind'
+
+		act 'Take a train to city center': gt 'pavtrainhall', 'centre'
+	end
+end
+
 if $ARGS[0] = 'work':
 	*clr & cla
 	'<center><h4>Pavlovsk train station interior</h4></center>'
@@ -122,7 +159,7 @@ if $ARGS[0] = 'work':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and wash the floor in the waiting room.'
 
-			act 'Continue':minut += 1 & gt 'vokzalGin', 'work'
+			act 'Continue':minut += 1 & gt 'pavtrainhall', 'work'
 		end
 	end
 
@@ -135,10 +172,10 @@ if $ARGS[0] = 'work':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and go to the men''s room.'
-			gs 'vokmantoiev', 'toilet_event'
+			gs 'pavtrainhall_events', 'toilet_event'
 			!!'You began to wash the floor in the men''s room, and then began to scrub toilets.'
 
-			act 'Leave restroom':minut += 1 & gt 'vokzalGin', 'work'
+			act 'Leave restroom':minut += 1 & gt 'pavtrainhall', 'work'
 		end
 	end
 
@@ -151,12 +188,12 @@ if $ARGS[0] = 'work':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener1.jpg"></center>'
 			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' room before mopping the floor.'
-			gs 'vokdinvera'
+			gs 'pavtrainhall_events', 'vera'
 
-			act 'Leave restroom':minut += 1 & gt 'vokzalGin', 'work'
+			act 'Leave restroom':minut += 1 & gt 'pavtrainhall', 'work'
 		end
 	end
-	act 'Return': gt 'vokzalGin'
+	act 'Return': gt 'pavtrainhall'
 end
 
 if $ARGS[0] = 'ticket':
@@ -165,72 +202,72 @@ if $ARGS[0] = 'ticket':
 	'<center><h4>Ticket office</h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg"></center>'
 
+	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
+	
 	if money >= 50:
 		act 'Buy a ticket':
 			cla
-			gs 'vokzalGin', 'buy_ticket'
+			gs 'pavtrainhall', 'buy_ticket'
 		end
 	end
 
 	if money >= 1500 and Trainpass_day <= daystart:
-		act 'Buy a weekly pass  (7 days - 1500 <b>₽</b>) ':
+		act 'Buy a weekly pass (7 days - 1500 <b>₽</b>) ':
 			cla
 			money -= 1500
 			Trainpass_day = daystart + 7
-			act 'Return': gt 'vokzalGin'
+			act 'Return': gt 'pavtrainhall'
 		end
 	end
 
 	if money >= 5500 and Trainpass_day <= daystart:
-		act 'Buy a monthly pass (30day -  5500 <b>₽</b>)':
+		act 'Buy a monthly pass (30day - 5500 <b>₽</b>)':
 			cla
 			money -= 5500
 			Trainpass_day = daystart + 30
-			act 'Return': gt 'vokzalGin'
+			act 'Return': gt 'pavtrainhall'
 		end
 	end
-
-
-	act 'Leave the ticket office':minut += 1 & gt 'vokzalGin'
 end
 
 if $ARGS[0] = 'buy_ticket':
+	
+	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
+	
 	if money >= 50:
 		act 'Buy a ticket to the old town (50 <b>₽</b>)':
 			money -= 50
-			gt 'vokzalGin', 'oldtown'
+			gt 'pavtrainhall', 'oldtown'
 		end
 	end
 
 	if money >= 75:
 		act 'Buy a ticket to the village of Gadukino (75 <b>₽</b>)':
 			money -= 75
-			gt 'vokzalGin', 'village'
+			gt 'pavtrainhall', 'village'
 		end
 	end
 
 	if money >= 100:
 		act 'Buy a ticket to the the communal village (100 <b>₽</b>)':
 			money -= 100
-			gt 'vokzalGin', 'communal'
+			gt 'pavtrainhall', 'communal'
 		end
 	end
 
 	if money >= 125:
 		act 'Buy a ticket to city industrial area (125 <b>₽</b>)':
 			money -= 125
-			gt 'vokzalGin', 'ind'
+			gt 'pavtrainhall', 'ind'
 		end
 	end
 
 	if money >= 150:
 		act 'Buy a ticket to city center (150 <b>₽</b>)':
 			money -= 150
-			gt 'vokzalGin', 'centre'
+			gt 'pavtrainhall', 'centre'
 		end
 	end
-
-	act 'Leave the ticket office':minut += 1 & gt 'vokzalGin'
 end
 
 if $ARGS[0] = 'oldtown':
@@ -278,8 +315,8 @@ if $ARGS[0] = 'communal':
 end
 
 if $ARGS[0] = 'ind':
-	$loc = 'vokzalholle'
-	$metka = ''
+	$loc = 'nordtrain'
+	$metka = 'platform'
 	minut += 35
 	if rand(1, 100) < 15: gt 'train', 'private'
 	if rand(1, 100) < 30: gt 'train', 'Gopnik'
@@ -290,7 +327,7 @@ if $ARGS[0] = 'ind':
 	'After 35 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalholle'
+		gt 'nordtrain', 'platform'
 	end
 end
 
@@ -311,5 +348,67 @@ if $ARGS[0] = 'centre':
 	end
 end
 
---- vokzalGin ---------------------------------
+if $ARGS[0] = 'toilet':
+	cls
+	vokzalToilet = 0
+	gs 'stat'
+
+	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+	'You are at the station''s restrooms, you can find the <a href="exec:minut += 1 & gt ''pavtrainhall'', ''female''">ladies'' room</a> and <a href="exec:minut += 1 & gt ''pavtrainhall'', ''male''">men''s room</a> here.'
+
+	act 'Return to the station':minut += 1 & gt 'pavtrainhall'
+end
+
+if $ARGS[0] = 'female':
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'bathroom'
+	cls
+	vokzalToilet = 1
+	gs 'stat'
+	'<center><h4>The ladies'' room</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
+	'You open the door to the ladies'' room and go in.'
+
+	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
+
+	act 'Look in the mirror': gt 'mirror', 'start'
+
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+	dynamic $removepan
+end
+
+if $ARGS[0] = 'male':
+	$metkaM = $ARGS[0]
+	$locM = $CURLOC
+	$metka = $ARGS[0]
+	$loc = $CURLOC
+	$location_type = 'bathroom'
+	cls
+	vokzalToilet = 2
+	gs 'stat'
+	'<center><h4>The men''s room</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
+	'You open the door to the men''s room and go in.'
+
+	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
+
+	if bimbolevel >= 1:
+		act 'Wait and see if someone finds you':gt 'trainbimbo', 'pos1'
+		act 'Quickly enter a stall':gt 'trainbimbo', 'pos5'
+	end
+
+	act 'Look in the mirror':gt 'mirror', 'start'
+
+	dynamic $tampon
+	dynamic $quickwash
+	dynamic $basin
+end
+
+--- pavtrainhall ---------------------------------
 

+ 319 - 31
locations/vokdinvera.qsrc → locations/pavtrainhall_events.qsrc

@@ -1,4 +1,92 @@
-# vokdinvera
+# pavtrainhall_events
+
+if $ARGS[0] = 'manager':
+	cls
+	gs 'stat'
+	'When you walk past the station manager''s office, you notice a sign next to the door:'
+	'"Cleaner wanted! 2 hours per day at any time, salary 130 <b>₽</b>. Ask inside for more info."'
+	'"Office opening hours : 08:00 - 17:00"'
+
+	act 'Return to the train station':minut += 1 & gt 'pavtrainhall'
+
+	if hour >= 8 and hour <= 16:
+		act 'Enter the office':
+			cls
+			gs 'stat'
+			'You knock on the door and enter the station manager''s office. An elderly man looks up from the papers on his desk and says, "Can I help you?"'
+
+			act 'Apologize and leave':minut += 1 & gt 'pavtrainhall'
+
+			if vokzalVork = 0:
+				act 'Apply for the cleaning job':
+					cls
+					vokzalVork = 1
+					minut += 15
+					gs 'stat'
+					'You give him a friendly nod: "Hello sir, I would like to apply for the cleaning job."'
+					'He''s delighted, and somewhat surprised that he actually has a candidate at such low wages. "Excellent, come on in! Take a seat."'
+					'He explains what you have to do while he takes your details: "Your job would be to wash the station floor, and clean both the restrooms. You can come work on any day you like, and can skip any day you don''t want to work."'
+					'"You have to clean all three areas before the end of the day, otherwise we have to hire someone else finish it. If you have only cleaned part of the rooms, you do not get paid at all." In conclusion he shows you the maintenance closet where the cleaning supplies are stored and shakes your hand, before returning to his work.'
+
+					act 'Leave the office':minut += 1 & gt 'pavtrainhall'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'wallet1':
+	cls
+	gs 'stat'
+	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+	'As you reach for the wallet, a foot steps on it just before you can pick it up. You look up, straight into the eyes of a slim girl. She looks around quickly and then softly asks: "Want to share?"'
+
+	act 'Keep it all for yourself':
+		cls
+		gs 'stat'
+		'<center><h4>Pavlovsk train station interior</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+		'You tell the girl to get lost, and quickly push her away and snag the wallet before she can protest. As you remove the money from it and stuff it in your pocket, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to... that girl must have ratted you out!'
+		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
+
+		act 'Give him back the money you stole': gt 'pavtrainhall_events', 'wallet2'
+	end
+
+	act 'Let her have the wallet and leave':minut += 1 & gt 'pavtrainhall'
+
+	act 'Share the money':
+		cls
+		gs 'stat'
+		'<center><h4>Pavlovsk train station interior</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+		'You pick up the wallet and drag the girl off to the side. Making sure you are not being watched, you quickly split the money in two even piles and give her half. She quickly walks away while you put your share in your pocket. Suddenly, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to...'
+		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
+
+		act 'Give him back the money you stole': gt 'pavtrainhall_events', 'wallet2'
+	end
+end
+
+if $ARGS[0] = 'wallet2':
+	cls
+	gs 'stat'
+	'You give back the money you took from his wallet, but he acts insulted: "That''s not all of it! I had much more in my wallet, where is it!? I want it back now or we''re going to the police station! This is your last chance!"'
+
+	act 'Give him your money':
+		cls
+		money = 0
+		podbros = 1
+		gs 'stat'
+		'<center><h4>Pavlovsk train station interior</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
+		'You don''t want a scandal. Who knows what could happen if you get arrested for theft? Hoping to placate him with a few bills of your own money, you decide to get your wallet. You pull out your own money, and start to count some of it out. Before you can finish, he pulls the entire pile out of your hands: "There it is! You''re lucky, girl... I''ll leave it at this, for just this once."'
+		'Before you can object, he walks away with all of your money.'
+		
+		act 'Leave':minut += 1 & gt 'pavtrainhall'
+	end
+end
+
+if $ARGS[0] = 'vera':
 	verarand = rand(0, 1)
 
 	if verakassir = 3 and hour >= 8 and hour <= 20 and verarand = 0:
@@ -30,7 +118,7 @@
 						'Vera looks at you suspiciously: "Really? That''s exactly what those school sluts would say, defending him like that..."'
 						'She shakes her head and waves you away so she can get back to work, giving you a mistrusting look as you leave.'
 
-						act 'Leave':minut += 1 & gt 'vokzalGin'
+						act 'Leave':minut += 1 & gt 'pavtrainhall'
 					end
 
 					act 'Suck up to Vera':
@@ -43,7 +131,7 @@
 						'You can see she needs some encouragement, and decide to placate her: "You''re still very attractive, Vera! Anatoly doesn''t know what he''s missing!"'
 						'She gives you an appreciative nod. After another minute of trash-talking the girls in school just like you, she realizes she has to get back to work. She waves you goodbye as you gather your things and get ready to leave. You''re not quite sure whether she was just insulting you or not.'
 
-						act 'Leave':minut += 1 & gt 'vokzalGin'
+						act 'Leave':minut += 1 & gt 'pavtrainhall'
 					end
 
 					exit
@@ -74,11 +162,11 @@
 								if veraboyrand > 8:
 								 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 									'Vera lets out a wistful sigh, and shrugs: "I don''t know... there''s not much to tell. I live with Anatoly now, and I slowly feel my virginity coming back to me. We never do anything together any more."'
-									act 'Leave':minut += 1 & gt'vokzalGin'
+									act 'Leave':minut += 1 & gt'pavtrainhall'
 								elseif veraboyrand <0:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 									'Vera lets out a wistful sigh and shrugs: "I don''t know <<$pcs_nickname>>, I don''t feel like talking more about the past right now."'
-									act 'Leave':minut += 1 & gt'vokzalGin'
+									act 'Leave':minut += 1 & gt'pavtrainhall'
 								end
 
 								if veraboyrand = 0:
@@ -88,7 +176,7 @@
 									'I was just laying there with my legs spread, under his sweaty body, while he was pounding me. Then he pulls out and shoots his sperm all over my stomach. So there I was, on my back... all covered in semen, my pussy all bloody, and what do you think he said!? He said I was like a log... he complained how he had to do all the work! That jerk didn''t even realize he robbed me of my innocence!'
 									'I got angry and left immediately, and never saw him again after that. At least no one in the village found out... I was so ashamed! For a month, I hid from everyone and didn''t even go for a walk, I couldn''t look anyone in the eye after losing my virginity like that."'
 
-									act 'Leave':minut += 1 & gt 'vokzalGin'
+									act 'Leave':minut += 1 & gt 'pavtrainhall'
 								elseif veraboyrand = 1:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk1.jpg"></center>'
 									'Vera gets ready to continue her story: "After that first experience, I was done with guys. Until one day at college... I met Oleg there, while I was working towards my undergraduate degree. He was a very bulky and muscular guy, and great at cycling. I bet he could bend a bicycle, if he wanted to... he was that strong. To my surprise he invited me for a drink one day. We went to a local cafe, and had a great time. He was such a nice guy!'
@@ -114,7 +202,7 @@
 											'You can''t argue with that, and nod: "I guess that is kind of a slutty thing to do... I can see where he''s coming from."'
 											'Vera shakes her head in disappointment, still stuck in her own thoughts: "Though I don''t know... didn''t he do the exact same thing, taking me home and fucking me on the very first day we met? Why is it always the girl''s fault?"'
 
-											act 'Leave':minut += 1 & gt 'vokzalGin'
+											act 'Leave':minut += 1 & gt 'pavtrainhall'
 										end
 
 										act 'Tell her he was wrong to ignore her':
@@ -127,7 +215,7 @@
 											'You notice Vera is sad and try to cheer her up: "He shouldn''t have treated you like that! He was just as happy to take you home the first day you met!"'
 											'She gives you a weak smile as she sighs: "I know, right? Why is the girl always at fault, when the guys do the same thing? It''s not fair..."'
 
-											act 'Leave':minut += 1 & gt 'vokzalGin'
+											act 'Leave':minut += 1 & gt 'pavtrainhall'
 										end
 									end
 								elseif veraboyrand = 2:
@@ -144,7 +232,7 @@
 										'You indignantly say: "You hated him... why? I thought you liked being treated like a piece of meat?"'
 										'Vera shakes her head wearily: "Maybe, but that doesn''t give him the right to just fuck my ass like that, with no concern for my feelings!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"Understandable"':
@@ -157,7 +245,7 @@
 										'You nod understandingly, saying he had no right to treat Vera like that.'
 										'Vera sighs sadly: "You know, secretly I actually kind of liked him. But it was really wrong of him to take advantage of a defenseless girl like that. And besides... who knows how many other girls he treated like that before me?"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 3:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk3.jpg"></center>'
@@ -175,7 +263,7 @@
 										'You snark: "Of course it does! Giving some random guy you had never met until 10 minutes ago a blowjob in the toilet stalls, and letting him cum all over your face... if that''s not slutty, I don''t know what is!"'
 										'Faith tries to defend herself, unhappy you''re calling her out: "Hey come on, it''s not like I was doing it just for him! I had an orgasm as well, and I really needed that... is that so wrong?"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"No way, you were just having fun!"':
@@ -188,7 +276,7 @@
 										'You give her a knowing smile as you shake your head: "No way! You were both consenting adults, and you both had an orgasm..."'
 										'She smiles when she notices you''re not judging her: "Exactly! We were just having some fun, not doing anyone any harm... there''s nothing wrong with that!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 4:
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/sex/anal/dog2.jpg"></center>'
@@ -205,7 +293,7 @@
 										'You can''t hide your disgust, and exclaim: "Anal sex? Urgh! That''s disgusting!"'
 										'Vera just gives you a disappointed look as she grins: "Oh dear... <<$pcs_nickname>>, you''re such a prude!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"Wow, that sounds hot!"':
@@ -218,7 +306,7 @@
 										'You give Vera a knowing grin: "Wow, anal every day... that sounds so hot!"'
 										'She smiles at you: "After some practise, it was really easy to relax my ass enough to take his dick in without any pain. And the orgasms... wow, they were heavenly!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 5:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk5.jpg"></center>'
@@ -238,7 +326,7 @@
 										'You shake your head in disbelief when you say: "Two at once!? I know you liked Leszek, but wow! That''s so slutty! And for so long, too! He must''ve just thought of you as a piece of meat, that whole time."'
 										'Vera doesn''t like your tone, and tries to defend herself: "Hey, Leszek was my boyfriend, and I know he loved me too! I really loved him... I just pretended his friend wasn''t really there, I only did it to make Leszek happy!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"Two guys at once? Good for you!"':
@@ -251,7 +339,7 @@
 										'You grin at Vera: "Two guys at once, whenever you wanted! Wow, that sounds like it could be fun! You''re so lucky, Vera!"'
 										'She nods at you, fondly remembering that time even though she won''t admit it: "Oh yes... two guys at once is definitely an interesting experience, but if you ask me it''s still better to be able to devote all your attention to one person."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 6:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk6.jpg"></center>'
@@ -268,7 +356,7 @@
 										'You listen to her story covering your mouth with your hand, and when she finishes you exclaim: "No way, that poor guy! He must''ve thought you were a huge whore, I can''t believe you did that on your first time!"'
 										'Vera just shrugs, unhappy you''re taking his side: "Hey, you don''t know what it''s like! When your former boyfriend fucked you together with his friend almost daily for years on end, you can''t just go back to boring vanilla sex! Lesko just wasn''t ready for me, I bet he regrets it now..."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"He just wasn''t right for you!"':
@@ -281,7 +369,7 @@
 										'You encourage her: "He doesn''t know what he''s missing, Vera! I can understand he''d be a bit surprised at first, but after a while a lot of men would love to have a girl who''s a bit more experienced and open to trying other things!"'
 										'Vera smiles at you as she nods: "It was a big step back, from getting fucked daily by two guys for several years in all my holes! I was just used to getting satisfied like that. I wonder if he regrets walking out on me now... I bet I would''ve satisfied him in more ways than any other girl ever could!"'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 7:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk7.jpg"></center>'
@@ -298,7 +386,7 @@
 										'You shake your head in disbelief, and say: "Wow... it sounds like you finally met a good guy. I can''t believe you let him go!"'
 										'She haughtily replied: "Hardly. In bed he never lasted long, he''d get on top of me and finish within 30 seconds! The few times I got him to lick me, he never even got close to my asshole... he pretended it wasn''t even there! There were so many times I just wanted to beg him to fuck my ass hard and make me cum! You''ll see what I mean, <<$pcs_nickname>>. If your man doesn''t want to try things, you''ll remember this conversation, and you''ll realize that I''m right. Life is too short to spend with a man who doesn''t satisfy you."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"He wasn''t right for you either!"':
@@ -311,7 +399,7 @@
 										'You nod understandingly and say: "That sounds awful! He sounds so boring... there are so many things you can do with your body, if you''re open to the idea of trying new things!"'
 										'She grins: "Exactly! With the experience I had, getting fucked by two guys at once almost daily, there''s no way I could see myself spend the rest of my days like that! And I knew he wouldn''t change... so I had to let him go."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								elseif veraboyrand = 8:
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/bvtalk8.jpg"></center>'
@@ -329,7 +417,7 @@
 										'You look at Vera in disbelief, never having expected this end to her story: "Prostitution!? That''s terrible Vera, how could you!?"'
 										'She hangs her head in shame for a moment, but then rebounds: "I was just a young naive girl <<$pcs_nickname>>, who thought her pussy could conquer the world. It was foolish of me, but I''ve paid my dues and ended up just fine. Things could''ve been a lot worse."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 
 									act '"At least you ended up doing okay!"':
@@ -342,7 +430,7 @@
 										'You put your hand on her shoulder and try to cheer her up: "Hey, everyone makes mistakes! At least you ended up okay!"'
 										'Vera gives you a bittersweet smile: "Yea... I guess I did. Anatoly doesn''t satisfy me in the slightest, but life with him is still better than some of the other things I''ve seen. I guess I should be grateful for that."'
 
-										act 'Leave':minut += 1 & gt 'vokzalGin'
+										act 'Leave':minut += 1 & gt 'pavtrainhall'
 									end
 								end
 							end
@@ -360,7 +448,7 @@
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/sex/lvtalk.jpg"></center>'
 								'Vera smirks, noticing your sudden interest. She tells you the story without much enthusiasm: "There was a girl in college, we got along just fine. Then one night when we got a bit drunk, she started to kiss me! Before I knew it, her head was between my legs... she sure knew what she was doing. It felt nice, but I couldn''t quite reach an orgasm... the thought of having a girl between my legs was just too weird. We tried a few more times, playing with each other''s boobs and pussy, I licked her asshole too. It just wasn''t for me. Nothing beats a hard cock to ride and stretch all your holes out with <<$pcs_nickname>>, trust me."'
 
-								act 'Leave':minut += 1 & gt 'vokzalGin'
+								act 'Leave':minut += 1 & gt 'pavtrainhall'
 							end
 						end
 					elseif veratalkrand = 3:
@@ -376,13 +464,13 @@
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 								'You''re not sure whether you want her to tell you about your teacher''s sex life, but ask anyway. Vera doesn''t give it a second thought, and says: "I guess it''s the classic story. During the honeymoon phase, everything is great. He was always ready to go, and open to try new things. We fucked a lot, those first months. Every day, all night long, in my ass while I was on my period... we just never stopped. But now, he barely even notices me any more. I wonder if he''s fucking any of those sluts in his classes... it''s not fair <<$pcs_nickname>>, how do I compete with those girls?"'
 
-								act 'Leave':minut += 1 & gt 'vokzalGin'
+								act 'Leave':minut += 1 & gt 'pavtrainhall'
 							end
 						end
 					end
 				end
 				killvar 'veratalkrand'
-				act 'Leave':minut += 1 & gt 'vokzalGin'
+				act 'Leave':minut += 1 & gt 'pavtrainhall'
 			elseif npc_rel['A27'] <= 0:
 				'You approach Vera, happy to have another chat to break the monotony of the day. She''ll have none of it though, and waves you away: "Leave me alone <<$pcs_nickname>>, I don''t want to talk to you."'
 
@@ -401,10 +489,10 @@
 						'Vera nods: "Thanks <<$pcs_nickname>>, I appreciate the apology. I guess I should forgive you."'
 					end
 
-					act 'Leave':minut += 1 & gt 'vokzalGin'
+					act 'Leave':minut += 1 & gt 'pavtrainhall'
 				end
 
-				act 'Leave':minut += 1 & gt 'vokzalGin'
+				act 'Leave':minut += 1 & gt 'pavtrainhall'
 			end
 		end
 	elseif verakassir = 2 and hour >= 8 and hour <= 20 and verarand = 0:
@@ -419,7 +507,7 @@
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 			'You put your cleaning supplies aside and go have a chat with Vera while no one is looking to buy a ticket anyway. After a while, the topic ends up being her sex life. Vera complains how her husband doesn''t satisfy her in bed.'
 
-			act 'Leave':minut += 1 & gt 'vokzalGin'
+			act 'Leave':minut += 1 & gt 'pavtrainhall'
 		end
 	elseif verakassir = 1 and hour >= 8 and hour <= 20 and verarand = 0:
 		'The cashier in the ticket office is having a cigarette break, you could go have a chat. You know her name is Vera.'
@@ -433,7 +521,7 @@
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vera/verasmoke.jpg"></center>'
 			'You go and chat for a few minutes with Vera while she smokes her cigarette, exchanging stories of how your days have been. During your talk, you learn that Vera is married and has a child. It turns out she''s the mother of Valeria Tsarev, the girl in your class you know as Lera. That means her husband must be Anatoly E. Tsarev, one of the teachers at school.'
 
-			act 'Leave':minut += 1 & gt 'vokzalGin'
+			act 'Leave':minut += 1 & gt 'pavtrainhall'
 		end
 	elseif verakassir = 0 and hour >= 8 and hour <= 20:
 		'While you''re on your way to clean the ladies'' room, you see the cashier in the ticket office look at you. She gives you a friendly nod while she smokes a cigarette, and you decide you could go for a quick break and have a chat if you feel like it.'
@@ -453,10 +541,210 @@
 			'This sounds interesting! You thank her: "Thanks for the tip, maybe I will! By the way, my name is <<$pcs_nickname>>."'
 			'She smiles as she replies: "Vera Tsarev, pleased to meet you. I have to get back to work now, I''ll be seeing you around!"'
 
-			act 'Leave':minut += 1 & gt 'vokzalGin'
+			act 'Leave':minut += 1 & gt 'pavtrainhall'
 		end
 	end
 	killvar 'verarand'
 	if $d_vokzal_vera_talk <> '': killvar '$d_vokzal_vera_talk' & npc_rel['A27'] = verafrend & killvar 'verafrend' &! this line can be removed after 2017/11
---- vokdinvera ---------------------------------
+end
+
+if $ARGS[0] = 'toilet_event':
+	startevtoirand = rand(0, 1)
+
+	if startevtoirand = 0:
+		vokmantoitipev = rand(0, 3)
+
+		if vokmantoitipev = 0:
+
+			!!if gloryholeVokzal = 9:gloryholeVokzal = 10 & ''
+			!!if gloryholeVokzal = 8:gloryholeVokzal = 9 & ''
+			!!if gloryholeVokzal = 6:gloryholeVokzal = 7 & ''
+			!!if gloryholeVokzal = 5:gloryholeVokzal = 6 & ''
+			!!if gloryholeVokzal = 4:gloryholeVokzal = 5 & ''
+			!!if gloryholeVokzal = 3:gloryholeVokzal = 4 & ''
+			!!if gloryholeVokzal = 2:gloryholeVokzal = 3 & ''
+
+			if gloryholeVokzal = 1:gloryholeVokzal = 2 & 'You notice that there is a puddle of a strange white liquid on the floor, near the hole in the wall between two stalls. When you take a piece of cloth and attempt to clean it, you realize it''s sperm. Suddenly the hole in the wall makes sense to you.'
+			if gloryholeVokzal = 0:gloryholeVokzal = 1 & 'You notice that in the wall between two of the toilet stalls, there is a circular hole around waist height. The edges of the hole are smooth. You shrug and keep cleaning, not thinking anything of it.'
+		elseif vokmantoitipev = 1:
+			'The station manager walks over to one of the urinals while you work, and lowers his pants just enough to pull his dick out. At least you think so, you can''t actually see.'
+
+			if pcs_horny >= 50:
+				act 'Try to sneak a peek':
+					cls
+					minut += 1
+					seepeenach += 1
+					tot_seepee += 1
+
+					if tot_seepee > 5:pcs_horny += 5
+
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
+					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. When he''s done, he washes his hands before he leaves.'
+					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
+
+					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+				end
+			end
+		elseif vokmantoitipev = 2:
+			'The police captain, Katalkin, walks over to one of the urinals while you work. He lowers his pants just enough to pull his dick out and you can hear the clattering of urine against the urinal porcelain.'
+
+			if pcs_horny >= 50:
+				act 'Try to sneak a peek':
+					cls
+					minut += 1
+					seepeecop += 1
+					tot_seepee += 1
+
+					if tot_seepee > 5:pcs_horny += 5
+
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
+					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. He doesn''t wash his hands when he leaves... gross!'
+					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
+
+					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+				end
+			end
+		elseif vokmantoitipev = 3:
+			'A random passenger walks over to one of the urinals while you work. He lowers his pants just enough to pull his dick out and you can hear the clattering of urine against the urinal porcelain.'
+
+			if pcs_horny >= 50:
+				act 'Try to sneak a peek':
+					cls
+					minut += 1
+					seepeeman += 1
+					tot_seepee += 1
+
+					if tot_seepee > 5:pcs_horny += 5
+
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
+					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. He doesn''t wash his hands when he leaves.'
+					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
+
+					gs 'arousal', 'voyeur', 3
+					gs 'arousal', 'end'
+					gs 'stat'
+
+					act 'Leave':minut += 1 & gt 'pavtrainhall', 'work'
+				end
+			end
+		end
+	elseif startevtoirand > 0:
+		'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
+	end
+end
+
+if $ARGS[0] = 'trinkets':
+	cls
+	minut += 30
+	prodskill = pcs_apprnc/4 + pcs_sprt + pcs_dom
+
+	if prodskill < 20:prodskill = 20
+	if prodskill > 150:minimumtov = 3
+	if prodskill > 100 and prodskill <= 150:minimumtov = 2
+	if prodskill < 100:minimumtov = 1
+
+	tovarand = rand(minimumtov, prodskill / 10)
+
+	if tovarand > tovarL:tovarand = tovarL
+
+	tovpay = tovarand * 300
+	money += tovpay
+	tovarL -= tovarand
+	sprt_exp += rand(0, 1)
+	TorgVokzalTimes += 1
+	pcs_dom += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/peron.jpg"></center>'
+	'You manage to sell <<tovarand>> trinkets to passengers today, while earning <<tovpay>> <b>₽</b>.'
+
+	act 'Leave':
+		cls
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+		if pcs_intel + pcs_prcptn > 80 and rand(0,5) = 5:
+			'Two police officers had been keeping an eye on you while you were trying to sell your goods, and when you move to leave the platform they move to intercept you, but you time your leaving with a large group of students and hide yourself amongst them. The police officers get caught up in the crowd and your route clear opens up.'
+
+			act 'Leave':minut += 1 & gt 'pavtrainhall'
+		exit
+
+		else
+			'Two police officers had been keeping an eye on you while you were trying to sell your goods, and when you move to leave the platform they approach you. Captain Katalkin says: "Excuse me miss, we saw you were attempting to sell items to passengers. Do you have the proper permits for that? We need to see your papers."'
+		end
+
+		if money >= 500:
+			act 'Bribe them (500 <b>₽</b>)':
+				cls
+				money -= 500
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+				'You smile at them: "Permits, officer? Of course I have the permits, one moment..."'
+				'You look around and, when you''re sure the coast is clear, stick out your hand with a 500 <b>₽</b> note in it.'
+				'The police officers smile at you and quickly take the money before they walk away: "I see everything''s in order. Have a nice day, miss."'
+
+				act 'Leave':minut += 1 & gt 'pavtrainhall'
+			end
+		end
+
+		act 'Beg him to forgive you':
+			cls
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+			'You show him your best innocent face and say: "Please sir, times are tough! I''ll get the permit, I''m sorry! Please let me go, I promise it won''t happen again!"'
+
+			if katalkinSexOnce = 0:
+				schtraf = 500
+				'Captain Katalkin grins at you: "We''ll see... come with me to the police station, we''ll have to have a little chat about this."'
+
+				act 'Go to the police station':minut += 5 & katalkinNoexit = 1 & gt 'katalkin'
+			else
+				if katalkinSexDay+7 >= daystart:
+					'Captain Katalkin recognizes you and grins, remembering his recent adventures with you: "You again? Well okay, go on then, run along."'
+
+					act 'Thank him and leave':minut += 1 & gt 'pavtrainhall'
+				elseif katalkinSexDay + 7 < daystart:
+					'Captain Katalkin suddenly recognizes you and frowns: "<<$pcs_nickname>>? You haven''t come to see me in a long time... I thought we had an agreement. Are you avoiding me?"'
+
+					act 'No you haven''t!':
+						cls
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+						'You blurt out a mixture of protests and apologies: "No sir! I''ve just been busy, that''s all... I''m sorry."'
+						'Captain Katalkin''s face brightens: "We can fix that. You''re coming with me to the police station now. I think I need to perform a thorough cavity search, to make sure you''re not smuggling anything."'
+						'He firmly puts his hand on your shoulder, and begins to walk towards the police station.'
+
+						act 'Blush and let him guide you':minut += 5 & katalkinNoexit = 1 & gt 'katalkin'
+					end
+				end
+			end
+		end
+
+		act 'Admit you have no permit':
+			cls
+			money = 0
+			tovarL = 0
+			minut += 120
+			pcs_mood = 5
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
+			'You decide to come clean to them, and admit you don''t have the required papers. The policemen do what you expected. They take you to the police station and confiscate all of your money and items, even the money that you didn''t earn by selling souvenirs. You try to object, but they don''t listen and tell you you''re lucky to not end up in jail for this. After two hours and a stern talking-to about the importance of permits, you''re free to go. You feel terrible.'
+
+			act 'Leave the police station':minut += 1 & gt'pavtrainhall'
+		end
+	end
+end
+
+
+--- pavtrainhall_events ---------------------------------
 

+ 1 - 1
locations/road.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = '':
 	if nroad = 0:act 'Go to the City Industrial Region (0:15)':minut += 15 & gt 'nord'
 	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 20:
-		act 'Go to Pavlovsk train station (0:15)': minut += 15 & gt 'vokzalG'
+		act 'Go to Pavlovsk train station (0:15)': minut += 15 & gt 'pavtrain'
 		act 'Go to Pavlovsk high street (0:15)': minut += 15 & gt 'pavCommercial'
 	end
 	if nroad < 20:act 'Walk towards Pavlovsk (1:00)':minut += 60 & nroad += 1 & gt $curloc

+ 4 - 4
locations/succubus.qsrc

@@ -776,23 +776,23 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 1: $sucgoloc = 'pavCommercial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'pavResidential' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'gskver' & $sucgometka = 'start'
-			if sctemp = 4: $sucgoloc = 'vokzalG' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'gLake' & $sucgometka = ''
 		elseif sucslpzone = 3:
 			if sctemp = 1: $sucgoloc = 'Nord' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'park' & $sucgometka = 'start'
 			if sctemp = 3: $sucgoloc = 'pavCommercial' & $sucgometka = ''
-			if sctemp = 4: $sucgoloc = 'vokzalG' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pavtrain' & $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 = 'vokzalG' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'Nord' & $sucgometka = ''
 		elseif sucslpzone = 5:
 			if sctemp = 1: $sucgoloc = 'gadukino' & $sucgometka = ''
-			if sctemp = 2: $sucgoloc = 'vokzalG' & $sucgometka = ''
+			if sctemp = 2: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'motel' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'Nord' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'park' & $sucgometka = 'start'

+ 67 - 70
locations/train.qsrc

@@ -18,6 +18,9 @@ if $ARGS[0] = 'communal':
 end
 
 if $ARGS[0] = 'communal_tickets':
+	
+	act 'Leave the ticket office': gt 'train', 'communal'
+	
 	act 'Buy a ticket to St. Petersburg city center (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -26,6 +29,7 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to St. Petersburg city industrial area (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -34,6 +38,7 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -42,6 +47,7 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to the old platform by the old town (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -50,6 +56,7 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to Pavlovsk (100 <b>₽</b>)':
 		if money >= 100:
 			money -= 100
@@ -58,20 +65,19 @@ if $ARGS[0] = 'communal_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
-	act 'Return': gt 'train', 'communal'
 end
 
 if $ARGS[0] = 'communal_trains':
 	act 'Leave the platform': gt 'train', 'communal'
-
+	
 	act 'Take a train to St. Petersburg city center': gt 'train', 'communal_centre'
-
+	
 	act 'Take a train to St. Petersburg city industrial area': gt 'train', 'communal_ind'
-
+	
 	act 'Take a train to the village of Gadukino': gt 'train', 'communal_village'
-
+	
 	act 'Take a train to the old platform by the old town': gt 'train', 'communal_oldtown'
-
+	
 	act 'Take a train to Pavlovsk': gt 'train', 'communal_pavlovsk'
 end
 
@@ -91,8 +97,8 @@ if $ARGS[0] = 'communal_centre':
 end
 
 if $ARGS[0] = 'communal_ind':
-	$loc = 'vokzalholle'
-	$metka = ''
+	$loc = 'nordtrain'
+	$metka = 'platform'
 	minut += 10
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
@@ -100,7 +106,7 @@ if $ARGS[0] = 'communal_ind':
 	'After 10 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalholle'
+		gt 'nordtrain', 'platform'
 	end
 end
 
@@ -134,15 +140,15 @@ if $ARGS[0] = 'communal_oldtown':
 end
 
 if $ARGS[0] = 'communal_pavlovsk':
-	$loc = 'vokzalperG'
-	$metka = ''
+	$loc = 'pavtrainhall'
+	$metka = 'platform'
 	minut += 25
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg" ></center>'
 	'After 5 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
-	act 'Get off the train': gt 'vokzalperG'
+	act 'Get off the train': gt 'pavtrainhall', 'platform'
 end
 
 !!destination 4
@@ -167,6 +173,9 @@ if $ARGS[0] = 'village':
 end
 
 if $ARGS[0] = 'village_tickets':
+	
+	act 'Leave the ticket office': gt 'train', 'village'
+	
 	act 'Buy a ticket to St. Petersburg city center (100 <b>₽</b>)':
 		if money >= 100:
 			money -= 100
@@ -175,6 +184,7 @@ if $ARGS[0] = 'village_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to St. Petersburg city industrial area (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -183,6 +193,7 @@ if $ARGS[0] = 'village_tickets':
 			'You don''t have enough money for this ticket.'	
 		end
 	end
+	
 	act 'Buy a ticket to the old platform by the communal village (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -191,6 +202,7 @@ if $ARGS[0] = 'village_tickets':
 			'You don''t have enough money for this ticket.'	
 		end
 	end	
+	
 	act 'Buy a ticket to the old town (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -199,6 +211,7 @@ if $ARGS[0] = 'village_tickets':
 			'You don''t have enough money for this ticket.'	
 		end
 	end
+	
 	act 'Buy a ticket to Pavlovsk (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -206,8 +219,7 @@ if $ARGS[0] = 'village_tickets':
 		else
 			'You don''t have enough money for this ticket.'	
 		end
-	end
-	act 'Return': gt 'train', 'village'
+	end	
 end
 
 if $ARGS[0] = 'village_trains':
@@ -224,7 +236,6 @@ if $ARGS[0] = 'village_trains':
 	act 'Take a train to Pavlovsk': gt 'train', 'village_pavlovsk'
 end
 
-
 if $ARGS[0] = 'village_centre':
 	$loc = 'cityTrain'
 	$metka = 'inside'
@@ -243,8 +254,8 @@ if $ARGS[0] = 'village_centre':
 end
 
 if $ARGS[0] = 'village_ind':
-	$loc = 'vokzalholle'
-	$metka = ''
+	$loc = 'nordtrain'
+	$metka = 'platform'
 	minut += 20
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -255,7 +266,7 @@ if $ARGS[0] = 'village_ind':
 	'After 20 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalholle'
+		gt 'nordtrain', 'platform'
 	end
 end
 
@@ -290,8 +301,8 @@ if $ARGS[0] = 'village_oldtown':
 end
 
 if $ARGS[0] = 'village_pavlovsk':
-	$loc = 'vokzalperG'
-	$metka = ''
+	$loc = 'pavtrainhall'
+	$metka = 'platform'
 	train_event = 0
 	money -= 75
 	train_dest = 6
@@ -303,7 +314,7 @@ if $ARGS[0] = 'village_pavlovsk':
 	'After 15 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalperG'
+		gt 'pavtrainhall', 'platform'
 	end
 end
 
@@ -326,6 +337,8 @@ end
 
 if $ARGS[0] = 'oldtown_tickets':
 	
+	act 'Leave the ticket office': gt 'train', 'oldtown'
+	
 	act 'Buy a ticket to St. Petersburg city center (125 <b>₽</b>)':
 		if money >= 125:
 			money -= 125
@@ -334,6 +347,7 @@ if $ARGS[0] = 'oldtown_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to St. Petersburg city industrial area (100 <b>₽</b>)':
 		if money >= 100:
 			money -= 100
@@ -342,6 +356,7 @@ if $ARGS[0] = 'oldtown_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end	
+	
 	act 'Buy a ticket to the old platform by the communal village (75 <b>₽</b>)':
 		if money >= 75:
 			money -= 75
@@ -350,6 +365,7 @@ if $ARGS[0] = 'oldtown_tickets':
 			'You don''t have enough money for this ticket.'
 		end
 	end
+	
 	act 'Buy a ticket to the village of Gadukino (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -358,6 +374,7 @@ if $ARGS[0] = 'oldtown_tickets':
 			'You don''t have enough money for this ticket.'	
 		end
 	end
+	
 	act 'Buy a ticket to Pavlovsk (50 <b>₽</b>)':
 		if money >= 50:
 			money -= 50
@@ -365,8 +382,7 @@ if $ARGS[0] = 'oldtown_tickets':
 		else
 			'You don''t have enough money for this ticket.'	
 		end
-	end
-	act 'Return': gt 'train', 'oldtown'
+	end	
 end
 
 if $ARGS[0] = 'oldtown_trains':
@@ -401,8 +417,8 @@ if $ARGS[0] = 'oldtown_centre':
 end
 
 if $ARGS[0] = 'oldtown_ind':
-	$loc = 'vokzalholle'
-	$metka = ''
+	$loc = 'nordtrain'
+	$metka = 'platform'
 	minut += 30
 	if rand(1, 100) <= 10: gt 'train_incidental', 'events'
 	if rand(1, 100) <= 20: gt 'train', 'events'
@@ -411,7 +427,7 @@ if $ARGS[0] = 'oldtown_ind':
 	'After 30 minutes, the train stops at the St. Petersburg city industrial area station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalholle'
+		gt 'nordtrain', 'platform'
 	end
 end
 
@@ -445,8 +461,8 @@ if $ARGS[0] = 'oldtown_village':
 end
 
 if $ARGS[0] = 'oldtown_pavlovsk':
-	$loc = 'vokzalperG'
-	$metka = ''
+	$loc = 'pavtrainhall'
+	$metka = 'platform'
 	minut += 5
 	if rand(1, 100) <= 20: gt 'train_incidental', 'events'
 	if rand(1, 100) < 20: gt 'train', 'events'
@@ -455,7 +471,7 @@ if $ARGS[0] = 'oldtown_pavlovsk':
 	'After 5 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 	act 'Get off the train':
 		if train_event = 0 and rand(1, 100) <= 5: gt 'train_incidental', 'end'
-		gt 'vokzalperG'
+		gt 'pavtrainhall', 'platform'
 	end
 end
 
@@ -513,7 +529,7 @@ if $ARGS[0] = 'weed':
 				'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 				act 'Get off the train':
 					if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-					gt 'vokzalperG'
+					gt 'pavtrainhall', 'platform'
 				end
 			end
 		end
@@ -549,7 +565,7 @@ if $ARGS[0] = 'weed':
 					'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 					act 'Get off the train':
 						if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-						gt 'vokzalperG'
+						gt 'pavtrainhall', 'platform'
 					end
 				end
 			end		
@@ -606,7 +622,7 @@ if $ARGS[0] = 'weed':
 								'After 40 minutes, you see the town of Pavlovsk approaching. Pavlovsk Castle is an impressive sight, even from a long distance. The train stops at its final destination, a platform in Pavlovsk station.'
 								act 'Get off the train':
 									if rand(1, 100) <= 5: gt 'train_incidental', 'end'
-									gt 'vokzalperG'
+									gt 'pavtrainhall', 'platform'
 								end
 							end
 						end
@@ -619,24 +635,21 @@ end
 
 !!events starting on the train. Only one act will show up depending which one triggered but they all start the same.
 if $ARGS[0] = 'private':
-	*clr
-	cla
+	*clr & cla
 	minut -= 35
 	train_event = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 	'You board the train and walk past several of the private compartments on your way to the general seating on the car you are on.'
 	act 'You walk past the private compartments':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride.jpg" ></center>'
 		'After the first stop you are walking past the open door of one of the private compartments, you hear a man''s voice call out to you: "Hello there, young lady! Would you care to join me?"'
 		'You stop and look inside, finding a clean-shaved man sitting there with a select few wrinkles that accentuate his angular features; you estimate that he''s in his late thirties or early forties. The expensive suit he''s wearing and the hints of cologne tickling your nose speak volumes of his wealth and his self-confident, even smug expression tells the rest of the story. He motions for you to sit with him. "It''s alright, there''s plenty of room in here. Why don''t you come in and close the door?"'
 		*nl
 		'You hesitate - he is undressing you with his eyes and not even trying to hide it, so you doubt that all he wants is a conversational partner and, sure enough, when he notices your pause, he pulls 500<b>₽</b> out of his wallet and puts it on the seat next to him. "If you come in and close the door, we can have a very enjoyable trip together... and you can get off with a little pocket money."'
 		act 'Refuse him':
-			*clr
-			cla
+			*clr & cla
 			minut += 35
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 			'You shake your head indignantly. "Fuck you, I''m no whore! Who do you think you are?!" You don''t give him time to respond but simply walk away and take a seat in the general seating area.' 
@@ -708,8 +721,7 @@ if $ARGS[0] = 'private':
 end
 
 if $ARGS[0] = 'oldman':
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 	'You choose an empty seat by the window and look outside, lost in thought, as others board the train. Shortly after the departure, an old man sits down next to you. He offers you some nuts from a bag he is carrying, and you politely take a few; you would have been content with spending the rest of the ride in silence but the man then starts talking to you about how he has not been back to this area since his wife died a few years ago. Curious and feeling somewhat obligated to keep the conversation going, as awkward as it may be, you ask him about his wife and learn that, until recently, they had had a happy, wonderful life together; alas, what they thought was just a bad cough that wouldn''t go away turned out to be lung cancer and she died a very slow and agonizing death while he could do nothing but watch and care for her.'
 	*nl		
@@ -717,8 +729,7 @@ if $ARGS[0] = 'oldman':
 	*nl
 	'He seems to want to say more but as the train pulls into the station you''re both headed for, he shakes his head as if saying no to himself. "Please, what is it?", you coax. He says he shouldn''t ask but wonders if you would be so kind to go with him to a place he and his wife liked to go. He would love the company if you were not too busy.'
 	act 'Refuse his request':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 		'You feel sorry for him but you really don''t have time for this, especially since you think this won''t be just a quick walk - after all, accepting a handful of nuts from him turned into story time! You inform him, with audible regret, that you just don''t have the time to accompany him; he nods sadly but understandingly and, once you''ve disembarked the train, you both go your separate ways.'
 !!which of these acts show up depending on where Sveta was going when the act triggered obviously.
@@ -734,8 +745,7 @@ if $ARGS[0] = 'oldman':
 		'He glances down when he sees what you''ve caught and quickly apologizes. He admits that he and his wife used to sneak down here and have sex. He says that you look so much like her and it has been years since he had sex... so maybe you could make an old, sad man feel young and happy again, even if only for a few short minutes?'
 
 		act '"No, that''s too much to ask"':
-			*clr
-			cla
+			*clr & cla
 			'You tell him that you''re not going to have sex with him. It is more than a little creepy to have sex where he and his wife used to do it, anyways. Feeling repelled by him and his request, you quickly pull free from him and make your way back to the platform, leaving the old guy to himself and his strange ideas.'
 			act 'Return to the station': gt $loc, $metka
 		end
@@ -785,8 +795,7 @@ if $ARGS[0] = 'oldman':
 end
 
 if $ARGS[0] = 'fit':
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'You are sitting in an empty seat by the window and looking outside, lost in thought, as others board the train. Shortly after the departure, a man in his thirties - or perhaps early forties - sits down next to you. You don''t give him more than a short glance as he takes the seat but it doesn''t take more than that to notice that he is in <b>great</b> shape. You try not to stare but you just can''t help yourself - the world outside the window is just too boring to hold your attention. Of course, your gaze does not go unnoticed and the man, grinning, engages you in a conversation.'
 	*nl
@@ -794,8 +803,7 @@ if $ARGS[0] = 'fit':
 	*nl
 	'As you talk, you realize you are both getting off at the next stop and he asks if you would like to go for a walk with him along the tracks after you disembark the train. As innocent as he tries to make it sound, you have no doubt what he would really like to do with you on that "walk"; but he <i>is</i> attractive and his fitness and charm are sexy enough to make his offer tempting.'
 	act 'Refuse his offer':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 		'You thank him but politely refuse his offer, claiming that, sadly, you don''t have time to go on a walk today and are already running late, really. He doesn''t seem too disappointed, though. "I''m sure we will meet again on the train sometime", he augurs with a smile, "and then you will have time for that walk." You don''t know if his prophecy is going to come true or not or if he truly believes what he said but, regardless, he remains a pleasant dialog partner for the rest of the ride.'
 !!which of these acts show up depending on where Sveta was going when the act triggered obviously.
@@ -858,8 +866,7 @@ if $ARGS[0] = 'fit':
 end
 
 if $ARGS[0] = 'young':
-	*clr
-	cla
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride1.jpg" ></center>'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train and it eventually departs. Most of the train ride passes in you silently daydreaming with the scenery outside blurring together. It''s not until someone heavily sits down next to you that you snap out of it. You turn to see a good looking young guy in his early to mid-twenties, greeting you with a bright smile. "I''ve gotta say: I''ve walked from one end of this train to the other and you are by far the most beautiful girl on it."' 
 	*nl
@@ -869,8 +876,7 @@ if $ARGS[0] = 'young':
 	'"I get off at the next stop", you respond without thinking. A suggestive grin curls his lips; it takes you a moment to realize how your words could be taken as a sexual innuendo and blush slightly - something about this guy makes you blush a lot more than usual.'
 	'"Well, I could help you with that, if you like", he offers, his eyes following your curves, "it''s always better to get off together."'
 	act 'Refuse':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 		'He may be good-looking, but it''s time he learned that that doesn''t have to mean anything. Shaking your head no, you tell him that "that''s not how I meant it." As you do, the train slows and comes to a stop.'
 		'"Oh, I get it!", he feigns realization at the ''misunderstanding'', "I didn''t mean that, either. I just, you know, thought we could hang out and have fun." His effort to save the situation is valiant, but you shoot him down again with a "no, thank you" and disembark the train without looking at him again.'
@@ -879,8 +885,7 @@ if $ARGS[0] = 'young':
 	end
 
 	act 'Accept':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/young.jpg" ></center>'
 		'You look him over and bite your lower lip as you consider his suggestion. You don''t even know him but, somehow, that makes it an even bigger turn on. You know exactly what he wants and, to your own small surprise, you find yourself wanting it too.' 
 		*nl
@@ -956,16 +961,14 @@ if $ARGS[0] = 'Gopnik':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/ride3.jpg" ></center>'
 	'You are sitting in an empty seat by the window, looking outside, lost in thought, as others board the train. A gopnik boy sits down next to you, but you try to ignore him and keep staring outside. Unfazed by that, he gives you once-over, a lewd grin you only see from the corner of your eyes, and leans in close, putting his arm around you. You turn your head to tell him off but your mouth is immediately covered by his! And, not content with just kissing you, the gopnik''s hand starts roaming across your breasts.'
 	act 'Stop him':
-		*clr
-		cla
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/ride2.jpg" ></center>'
 		'After the immediate shock has passed, you push him away, but that doesn''t deter him in the slightest: He immediately tries to kiss and grope you again. You push him off once more, then get up and move to another seat, next to a woman who nods at you sympathetically and shoots the gopnik a nasty look. With nowhere to sit from where he could harass you, the boy looks at you for a moment, then shrugs and looks out the window. The rest of the ride is fairly uneventful; you spend most of it chatting with your seatmate / savior about men who molest women on trains.'
 !!which of these acts show up depending on where Sveta was going when the act triggered obviously.
 		act 'Continue journey': gt $loc, $metka
 	end
 	act 'Go with it':
-		*clr
-		cla
+		*clr & cla
 		minut -= 30
 		pav_sex += 5
 		'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnik.jpg" ></center>'
@@ -975,13 +978,11 @@ if $ARGS[0] = 'Gopnik':
 		gs 'arousal', 'foreplay', 5, 'unknown', 'exhibitionism'
 		gs 'stat'
 		act 'Decline':
-			*clr
-			cla
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnik.jpg" ></center>'
 			'You shake your head no - you don''t wanna take it this far with him. "Sorry, but I don''t have time. It was fun, though. The trip was a lot more exciting than I expected." He looks a little disappointed, so you comfortingly pat his cheek. "Maybe I will see you again sometime and we can pick up where we left off." You lean in and give him a long, slow kiss goodbye, then bounce away and head off the platform. You hear him mutter about not getting more action, but you don''t really care - all you care about right now is that the train ride just flew by.'
 			act 'Return to the station and catch the next train':
-				*clr
-				cla
+				*clr & cla
 				minut += 30	
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
@@ -990,8 +991,7 @@ if $ARGS[0] = 'Gopnik':
 			end
 		end
 		act 'Agree':
-			*clr
-			cla
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/gopnikwalk.jpg" ></center>'
 			'He takes you to the skyway over the tracks, holding your hand and pointing out different buildings and things. You already know almost everything he is talking about, but you let him talk for one very simple reason: He is surprisingly charming and sweet now, compared to the pawing weirdo you met on the train. He throws a lot of compliments your way, telling you how "the sun pales in comparison to your beauty" and the like. You consider telling him he really doesn''t have to try this hard, but some exaggeration funny exaggerations aside, you genuinely enjoy flirting with him and let him go on.'
 			*nl
@@ -1066,8 +1066,7 @@ if $ARGS[0] = 'Gopnik':
 							gs 'stat'
 
 							act 'Give him your number':
-								*clr
-								cla
+								*clr & cla
 !!25% chance he really does call and become a boyfriend, unless you already have 3 lovers.
 								if rand(0,3) = 0:
 									gs 'boyfrend', 'start'
@@ -1076,8 +1075,7 @@ if $ARGS[0] = 'Gopnik':
 								'"I''d like that", you tell him and give him your phone number. He waits until you''re more or less presentable again, then walks you back up to the skywalk where you two part ways.'
 
 								act 'Return to the station and catch the next train':
-									*clr
-									cla
+									*clr & cla
 									minut += 30	
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'
@@ -1092,8 +1090,7 @@ if $ARGS[0] = 'Gopnik':
 								'He shrugs like he doesn''t care either way but the look he gives you tells you that he''s a little pissed. "Sure, whatever. See you around." With that, he turns and walks off, leaving you to finish getting your clothes back in order.'
 
 								act 'Return to the station and catch the next train':
-									*clr
-									cla
+									*clr & cla
 									minut += 30	
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/shared/train/electri.jpg"></center>'

+ 30 - 30
locations/vokBimbo.qsrc → locations/trainBimbo.qsrc

@@ -1,4 +1,4 @@
-# vokBimbo
+# trainbimbo
 
 if $ARGS[0] = 'pos1':
 	cla
@@ -18,33 +18,33 @@ if $ARGS[0] = 'pos1':
 
 	if temp > 8:
 		'The restroom door opens and a young man comes in. He is taken aback by surprise, when he see''s you in the men''s room.'
-		act 'Pretend to straighten your hair.':gt 'vokBimbo', 'pos4'
+		act 'Pretend to straighten your hair.':gt 'trainbimbo', 'pos4'
 		if pcs_horny > 50:
 			act 'You look at him and smile.':
 				gs 'npcgeneratec', 0, 'young man', rand(18,25)
 				gs 'boyStat', $npclastgenerated
-				gt 'vokBimbo', 'pos2'
+				gt 'trainbimbo', 'pos2'
 			end
 		end
 	elseif temp < 3:
 		'The restroom door opens and a older man in his fifties comes in. He is taken aback by surprise, when he see''s you in the men''s room.'
-		act 'Pretend to straighten your hair.':gt 'vokBimbo', 'pos4'
+		act 'Pretend to straighten your hair.':gt 'trainbimbo', 'pos4'
 		if pcs_horny > 50:
 			act 'You look at him and smile.':
 				gs 'npcgeneratec', 0, 'fifty year old man', rand(50,59)
 				gs 'boyStat', $npclastgenerated
-				gt 'vokBimbo', 'pos3'
+				gt 'trainbimbo', 'pos3'
 			end
 		end
 	elseif temp = 5:
 		'The restroom door opens and a group of drunk guys come in. They are taken aback by surprise, when they see you in the men''s room.'
-		act 'Pretend to straighten your hair.':gt 'vokBimbo', 'pos4'
+		act 'Pretend to straighten your hair.':gt 'trainbimbo', 'pos4'
 		if pcs_horny > 70:
-			act 'You look at them and smile.':gt 'vokBimbo', 'pos6'
+			act 'You look at them and smile.':gt 'trainbimbo', 'pos6'
 		end
 	end
-	act 'Wait for men':gt 'vokBimbo', 'pos1'
-	act 'Leave':gt 'vokmantoiev', 'male'
+	act 'Wait for men':gt 'trainbimbo', 'pos1'
+	act 'Leave':gt 'pavtrainhall', 'male'
 end
 
 if $ARGS[0] = 'pos2':
@@ -55,8 +55,8 @@ if $ARGS[0] = 'pos2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo2.jpg"></center>'
 	'A unfamiliar man blushed and went into a stall.'
-	act 'Follow him into the stall.':gt 'vokBimbo', 'pos22'
-	act 'Leave':gt 'vokmantoiev', 'male'
+	act 'Follow him into the stall.':gt 'trainbimbo', 'pos22'
+	act 'Leave':gt 'pavtrainhall', 'male'
 end
 
 if $ARGS[0] = 'pos22':
@@ -91,7 +91,7 @@ if $ARGS[0] = 'pos22':
 			'You keep sucking his dick and you are rewarded with hots spurts of cum shooting into your mouth and filling it. There was some much sperm that some of it leaks from the corner of your lips as you keep sucking his cock as he cums.'
 			'Once he finally stops spurting sperm in your mouth, you stand up swallowing his cum. You wipe the cum off the corners of your lips and sucks your fingers clean, as you smile at him.'
 
-			act 'Leave the stall':gt'vokBimbo','pos1'
+			act 'Leave the stall':gt'trainbimbo','pos1'
 		end
 
 		act 'Jerk him off':
@@ -105,7 +105,7 @@ if $ARGS[0] = 'pos22':
 			'You pull your mouth off his cock and sit back with your face tilted up, he gets the idea and starts jerking off.'
 			'Soon hot spurt of cum is splashing across your face and into your hair. You squeezed her eyes shut to keep the sperm out of your eyes, as feel as another jet of hot cum landed on your face.'
 
-			act 'leave the stall':gt'vokBimbo','pos1'
+			act 'leave the stall':gt'trainbimbo','pos1'
 		end
 			
 	end
@@ -129,10 +129,10 @@ if $ARGS[0] = 'pos22':
 			pcs_horny = 0 & orgasm += 1 & 'When you feel him cumming, your own orgasm sweeps through you.'
 		end	
 
-		act 'Leave the stall.':gt 'vokBimbo', 'pos1'
+		act 'Leave the stall.':gt 'trainbimbo', 'pos1'
 	end
 	
-	act 'Leave':gt 'vokmantoiev', 'male'
+	act 'Leave':gt 'pavtrainhall', 'male'
 end
 
 
@@ -149,8 +149,8 @@ if $ARGS[0] = 'pos3':
 	cla
 	'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bimbo.knees'+rand(0,6)+'.jpg"></center>'
 	'You get down on your knees and open your mouth to suck his cock.'
-		act'Suck':gt'vokBimbo','pos33'
-		act 'Run out of the bathroom.':gt'vokzalGin'
+		act'Suck':gt'trainbimbo','pos33'
+		act 'Run out of the bathroom.':gt'pavtrainhall'
 	end
 end
 
@@ -166,7 +166,7 @@ if $ARGS[0] = 'pos33':
     'You start gagging and struggling to breath, after a bit he stops forcing himself so deep in your mouth, giving you time to recover.'
     'He repeats these actions several times,while you start taking off your clothes.'
 
-	act 'Pull your panties off and masturbate':gt 'vokBimbo', 'pos333'
+	act 'Pull your panties off and masturbate':gt 'trainbimbo', 'pos333'
 end
 
 if $ARGS[0] = 'pos333':
@@ -184,10 +184,10 @@ if $ARGS[0] = 'pos333':
 	'You start rubbing your clit as the guy fucks your mouth and throat. After a bit you are completely naked, once you he pulls you up and pushes you are he pushes you down on the floor where you sprawl before him, you clothes laying around you, as he says.'
 	if rand(0,1) = 0:
 		'"You''re hot and give great head, but I think I want to try that tight little ass of yours."'
-		act 'Next':gt 'vokBimbo', 'pos3333'
+		act 'Next':gt 'trainbimbo', 'pos3333'
 	else
 		'"You''re hot and give great head, but I think I want to try that tight little pussy of yours."'
-		act 'Next':gt 'vokBimbo', 'pos3334'
+		act 'Next':gt 'trainbimbo', 'pos3334'
 	end
 end
 
@@ -213,7 +213,7 @@ if $ARGS[0] = 'pos3333':
 		pcs_horny = 0 & orgasm += 1 & 'When you feel him cumming, your own orgasm sweeps through you.'
 	end	
 
-	act 'Next':gt 'vokBimbo', 'pos33333'
+	act 'Next':gt 'trainbimbo', 'pos33333'
 end
 
 if $ARGS[0] = 'pos3334':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'pos3334':
 	'After he finishing inside you he lets you go, and begins to make himself presentable.'
 	gs 'stat'
 	
-	act 'Next':gt 'vokBimbo', 'pos33333'
+	act 'Next':gt 'trainbimbo', 'pos33333'
 end
 
 if $ARGS[0] = 'pos33333':
@@ -253,7 +253,7 @@ if $ARGS[0] = 'pos33333':
 	if rand1>=40:'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/sex/bimbo.cum.body0.mp4"></video></center>'
 	'He pushes you down on the dirty floor and he starts jerking off standing over you. Soon his spurts of hot sperm start raining down all over you body. Once he is finished cumming on you, he pulls out a marker and writes on your chest Pussy Whore. "This way it will be clear to everyone what you really are, ha ha ha!" He pulled up his pants and left you there lying on the floor covered in cum.'
 
-	act 'dress':gt 'vokBimbo', 'pos1'
+	act 'dress':gt 'trainbimbo', 'pos1'
 end
 
 if $ARGS[0] = 'pos4':
@@ -264,8 +264,8 @@ if $ARGS[0] = 'pos4':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo4.jpg"></center>'
 	'You pretend not to notice anything. Maybe they will just think you are so stupid, that you mixed up the women''s room with the mens room.'
 
-	act 'wait':gt 'vokBimbo', 'pos1'
-	act 'Leave':gt 'vokmantoiev', 'male'
+	act 'wait':gt 'trainbimbo', 'pos1'
+	act 'Leave':gt 'pavtrainhall', 'male'
 end
 
 if $ARGS[0] = 'pos5':
@@ -276,7 +276,7 @@ if $ARGS[0] = 'pos5':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokbimbo1.jpg"></center>'
 	'You ran into a toilet stall and closed the door. You feel shame at the thought of anyone catching you in here. Your heart was pounding in your chest.'
 
-	act 'Run out of toilet':gt 'vokmantoiev', 'male'
+	act 'Run out of toilet':gt 'pavtrainhall', 'male'
 end
 
 if $ARGS[0] = 'pos6':
@@ -292,9 +292,9 @@ if $ARGS[0] = 'pos6':
 		*clr
 		'<center><video autoplay loop src="images/locations/pavlovsk/trainstation/bimbo.strip'+rand(0,6)+'.mp4"></video></center>'
 		'You strip out of your clothes.'
-		act 'Further':gt'vokBimbo','pos66'
+		act 'Further':gt'trainbimbo','pos66'
 	end
-	act 'Ran out of toilet':gt'vokzalGin'
+	act 'Ran out of toilet':gt'pavtrainhall'
 end
 
 if $ARGS[0] = 'pos66':
@@ -371,8 +371,8 @@ if $ARGS[0] = 'pos66':
 		gs 'cuminsidereact', 'some drunk guy whom you likely won''t even remember tomorrow', sck
 	end
 	'After taking a few breaths, you stand up with some difficulty and gather your scattered stuff from the bathroom floor.'
-	act 'dress':gt 'vokBimbo', 'pos1'
+	act 'dress':gt 'trainbimbo', 'pos1'
 end
 
---- vokBimbo ---------------------------------
+--- trainbimbo ---------------------------------
 

+ 0 - 90
locations/vokdin.qsrc

@@ -1,90 +0,0 @@
-# vokdin
-
-$din_vokzalg_kabinet = {
-	cls
-	gs 'stat'
-	'When you walk past the station manager''s office, you notice a sign next to the door:'
-	'"Cleaner wanted! 2 hours per day at any time, salary 130 <b>₽</b>. Ask inside for more info."'
-	'"Office opening hours : 08:00 - 17:00"'
-
-	act 'Return to the train station':minut += 1 & gt 'vokzalGin'
-
-	if hour >= 8 and hour <= 16:
-		act 'Enter the office':
-			cls
-			gs 'stat'
-			'You knock on the door and enter the station manager''s office. An elderly man looks up from the papers on his desk and says, "Can I help you?"'
-
-			act 'Apologize and leave':minut += 1 & gt 'vokzalGin'
-
-			if vokzalVork = 0:
-				act 'Apply for the cleaning job':
-					cls
-					vokzalVork = 1
-					minut += 15
-					gs 'stat'
-					'You give him a friendly nod: "Hello sir, I would like to apply for the cleaning job."'
-					'He''s delighted, and somewhat surprised that he actually has a candidate at such low wages. "Excellent, come on in! Take a seat."'
-					'He explains what you have to do while he takes your details: "Your job would be to wash the station floor, and clean both the restrooms. You can come work on any day you like, and can skip any day you don''t want to work."'
-					'"You have to clean all three areas before the end of the day, otherwise we have to hire someone else finish it. If you have only cleaned part of the rooms, you do not get paid at all." In conclusion he shows you the maintenance closet where the cleaning supplies are stored and shakes your hand, before returning to his work.'
-
-					act 'Leave the office':minut += 1 & gt 'vokzalGin'
-				end
-			end
-		end
-	end
-}
-
-$din_vokazalg_podbros2 = {
-	cls
-	gs 'stat'
-	'You give back the money you took from his wallet, but he acts insulted: "That''s not all of it! I had much more in my wallet, where is it!? I want it back now or we''re going to the police station! This is your last chance!"'
-
-	act 'Give him your money':
-		cls
-		money = 0
-		podbros = 1
-		gs 'stat'
-		'<center><h4>Pavlovsk train station interior</h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-		'You don''t want a scandal. Who knows what could happen if you get arrested for theft? Hoping to placate him with a few bills of your own money, you decide to get your wallet. You pull out your own money, and start to count some of it out. Before you can finish, he pulls the entire pile out of your hands: "There it is! You''re lucky, girl... I''ll leave it at this, for just this once."'
-		'Before you can object, he walks away with all of your money.'
-		
-		act 'Leave':minut += 1 & gt 'vokzalGin'
-	end
-}
-
-$din_vokzalg_podbros = {
-	cls
-	gs 'stat'
-	'<center><h4>Pavlovsk train station interior</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-	'As you reach for the wallet, a foot steps on it just before you can pick it up. You look up, straight into the eyes of a slim girl. She looks around quickly and then softly asks: "Want to share?"'
-
-	act 'Keep it all for yourself':
-		cls
-		gs 'stat'
-		'<center><h4>Pavlovsk train station interior</h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-		'You tell the girl to get lost, and quickly push her away and snag the wallet before she can protest. As you remove the money from it and stuff it in your pocket, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to... that girl must have ratted you out!'
-		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
-
-		act 'Give him back the money you stole':dynamic $din_vokazalg_podbros2
-	end
-
-	act 'Let her have the wallet and leave':minut += 1 & gt 'vokzalGin'
-
-	act 'Share the money':
-		cls
-		gs 'stat'
-		'<center><h4>Pavlovsk train station interior</h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-		'You pick up the wallet and drag the girl off to the side. Making sure you are not being watched, you quickly split the money in two even piles and give her half. She quickly walks away while you put your share in your pocket. Suddenly, you feel a hand firmly grasping your shoulder. It''s the man who the wallet belongs to...'
-		'You sigh and give him the empty wallet back, hoping he won''t check. Unfortunately for you, he checks. He bellows: "Young lady, you have 5 seconds to give me my money back or we''re going to the police station!"'
-
-		act 'Give him back the money you stole':dynamic $din_vokazalg_podbros2
-	end
-}
-
---- vokdin ---------------------------------
-

+ 0 - 162
locations/vokmantoiev.qsrc

@@ -1,162 +0,0 @@
-# vokmantoiev
-
-if $ARGS[0] = 'start':
-	cls
-	vokzalToilet = 0
-	gs 'stat'
-
-	'<center><h4>Pavlovsk train station interior</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
-	'You are at the station''s restrooms, you can find the <a href="exec:minut += 1 & gt ''vokmantoiev'', ''female''">ladies'' room</a> and <a href="exec:minut += 1 & gt ''vokmantoiev'', ''male''">men''s room</a> here.'
-
-	act 'Return to the station':minut += 1 & gt 'vokzalGin'
-end
-
-if $ARGS[0] = 'female':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$location_type = 'bathroom'
-	cls
-	vokzalToilet = 1
-	gs 'stat'
-	'<center><h4>The ladies'' room</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
-	'You open the door to the ladies'' room and go in.'
-
-	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
-
-	act 'Look in the mirror': gt 'mirror', 'start'
-
-	dynamic $tampon
-	dynamic $quickwash
-	dynamic $basin
-	dynamic $removepan
-end
-
-if $ARGS[0] = 'male':
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
-	$location_type = 'bathroom'
-	cls
-	vokzalToilet = 2
-	gs 'stat'
-	'<center><h4>The men''s room</h4></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
-	'You open the door to the men''s room and go in.'
-
-	act 'Leave':minut += 1 & gt 'vokmantoiev', 'start'
-
-	if bimbolevel >= 1:
-		act 'Wait and see if someone finds you':gt 'vokBimbo', 'pos1'
-		act 'Quickly enter a stall':gt 'vokBimbo', 'pos5'
-	end
-
-	act 'Look in the mirror':gt 'mirror', 'start'
-
-	dynamic $tampon
-	dynamic $quickwash
-	dynamic $basin
-end
-
-if $ARGS[0] = 'toilet_event':
-	startevtoirand = rand(0, 1)
-
-	if startevtoirand = 0:
-		vokmantoitipev = rand(0, 3)
-
-		if vokmantoitipev = 0:
-
-			!!if gloryholeVokzal = 9:gloryholeVokzal = 10 & ''
-			!!if gloryholeVokzal = 8:gloryholeVokzal = 9 & ''
-			!!if gloryholeVokzal = 6:gloryholeVokzal = 7 & ''
-			!!if gloryholeVokzal = 5:gloryholeVokzal = 6 & ''
-			!!if gloryholeVokzal = 4:gloryholeVokzal = 5 & ''
-			!!if gloryholeVokzal = 3:gloryholeVokzal = 4 & ''
-			!!if gloryholeVokzal = 2:gloryholeVokzal = 3 & ''
-
-			if gloryholeVokzal = 1:gloryholeVokzal = 2 & 'You notice that there is a puddle of a strange white liquid on the floor, near the hole in the wall between two stalls. When you take a piece of cloth and attempt to clean it, you realize it''s sperm. Suddenly the hole in the wall makes sense to you.'
-			if gloryholeVokzal = 0:gloryholeVokzal = 1 & 'You notice that in the wall between two of the toilet stalls, there is a circular hole around waist height. The edges of the hole are smooth. You shrug and keep cleaning, not thinking anything of it.'
-		elseif vokmantoitipev = 1:
-			'The station manager walks over to one of the urinals while you work, and lowers his pants just enough to pull his dick out. At least you think so, you can''t actually see.'
-
-			if pcs_horny >= 50:
-				act 'Try to sneak a peek':
-					cls
-					minut += 1
-					seepeenach += 1
-					tot_seepee += 1
-
-					if tot_seepee > 5:pcs_horny += 5
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
-					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. When he''s done, he washes his hands before he leaves.'
-					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
-
-					gs 'arousal', 'voyeur', 3
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Leave':minut += 1 & gt 'vokzalGin', 'work'
-				end
-			end
-		elseif vokmantoitipev = 2:
-			'The police captain, Katalkin, walks over to one of the urinals while you work. He lowers his pants just enough to pull his dick out and you can hear the clattering of urine against the urinal porcelain.'
-
-			if pcs_horny >= 50:
-				act 'Try to sneak a peek':
-					cls
-					minut += 1
-					seepeecop += 1
-					tot_seepee += 1
-
-					if tot_seepee > 5:pcs_horny += 5
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
-					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. He doesn''t wash his hands when he leaves... gross!'
-					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
-
-					gs 'arousal', 'voyeur', 3
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Leave':minut += 1 & gt 'vokzalGin', 'work'
-				end
-			end
-		elseif vokmantoitipev = 3:
-			'A random passenger walks over to one of the urinals while you work. He lowers his pants just enough to pull his dick out and you can hear the clattering of urine against the urinal porcelain.'
-
-			if pcs_horny >= 50:
-				act 'Try to sneak a peek':
-					cls
-					minut += 1
-					seepeeman += 1
-					tot_seepee += 1
-
-					if tot_seepee > 5:pcs_horny += 5
-
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/event/seepee.jpg"></center>'
-					'You try and sneak a glance at his penis and succeed. It''s flacid, and a stream of urine is steadily flowing from it. He doesn''t wash his hands when he leaves.'
-					'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
-
-					gs 'arousal', 'voyeur', 3
-					gs 'arousal', 'end'
-					gs 'stat'
-
-					act 'Leave':minut += 1 & gt 'vokzalGin', 'work'
-				end
-			end
-		end
-	elseif startevtoirand > 0:
-		'You wash the floor in the men''s room, and ponder whether you should move out for a minute when you hear a man loudly evacuate his bowels. You decide against it and just focus on finishing your cleaning work as fast as you can, doing your best to ignore the smell.'
-	end
-end
-
---- vokmantoiev ---------------------------------
-

+ 0 - 27
locations/vokzal.qsrc

@@ -1,27 +0,0 @@
-# vokzal
-$metka = $ARGS[0]
-$loc = $CURLOC
-$location_type = 'public_outdoors'
-cls
-gs'stat'
-'<center><B>Railway station</B></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
-
-if car > 0 and cardrive = 19:
-	cardrive = 19
-	'In the parking lot is <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
-end
-
-if RAND(1,100) > 70:
-	'You see <a href="exec:GT ''etoexhib'',''pos54''">suspicious character.</a>'
-	!fakes use 2 for aware of need for, 1 for have, otherwise 0
-	if fakepassport = 2 or fakediplom = 2:
-		'When you pass by the suspicious character, he whispers to you: "I have what you want, miss"'
-	end
-end
-
-act 'Go to the city industrial region': minut += 15 & gt'nord'
-act 'Enter the station building': minut += 2 & gt'vokzalholle'
-
---- vokzal ---------------------------------
-

+ 0 - 24
locations/vokzalper.qsrc

@@ -1,24 +0,0 @@
-# vokzalper
-$metka = $ARGS[0]
-$loc = $CURLOC
-$location_type = 'public_outdoors'
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzalper.jpg" ></center>'
-'When you arrive at the platform, you can''t help but notice it bustling with activity. Lots of passengers are coming and going, all carrying large bags. It feels like it is always busy here, no matter at what time of the day you are here.'
-
-if Trainpass_day > daystart:
-	act 'Take a train to the city center': gt 'vokzalholle', 'centre'
-
-	act 'Take a train to the old platform by the communal village': gt 'vokzalholle', 'communal'
-
-	act 'Take a train to the village of Gadukino': gt 'vokzalholle', 'village'
-
-	act 'Take a train to the old town': gt 'vokzalholle', 'oldtown'
-
-	act 'Take a train to Pavlovsk': gt 'vokzalholle', 'pavlovsk'
-end
-	
-act 'Return to the station hall':gt 'vokzalholle' & minut+=5
-
---- vokzalper ---------------------------------
-

+ 0 - 38
locations/vokzalperG.qsrc

@@ -1,38 +0,0 @@
-# vokzalperG
-$metka = $ARGS[0]
-$loc = $CURLOC
-$location_type = 'public_outdoors'
-CLOSE ALL
-if sound = 0:
-	if month >=11 and month <= 12 or month >=1 and month <=3:
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
-		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
-	else
-		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
-		if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
-	end
-end
-
-clr
-gs'stat'
-
-'<center><H4>Pavlovsk station platforms</H4></center>'
-'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
-'Because Pavlovsk is a place that attracts a fair amount of tourists, the station can be quite busy at times. The busiest times on the platforms are between 11:00 and 11:30, and between 18:00 and 18:30 when the long-distance trains are ready for boarding.'
-
-if Trainpass_day > daystart:
-	act 'Take a train to the old town': gt 'vokzalGin', 'oldtown'
-
-	act 'Take a train to the village of Gadukino': gt 'vokzalGin', 'village'
-
-	act 'Take a train to the the communal village': gt 'vokzalGin', 'communal'
-
-	act 'Take a train to city industrial area': gt 'vokzalGin', 'ind'
-
-	act 'Take a train to city center': gt 'vokzalGin', 'centre'
-end
-
-act 'Return to the station building': gt'vokzalGin'
-
---- vokzalperG ---------------------------------
-

+ 0 - 37
locations/vokzaltoilet.qsrc

@@ -1,37 +0,0 @@
-# vokzaltoilet
-CLOSE ALL
-
-$metkaM = $ARGS[0]
-$locM = $CURLOC
-$metka = $ARGS[0]
-$loc = $CURLOC
-$location_type = 'bathroom'
-clr
-gs'stat'
-
-if night_mode = 1:
-	fcolor = rgb(255, 255, 255)
-	bcolor = rgb(0, 0, 0)
-	lcolor = rgb(106, 90, 205)
-else
-	fcolor = rgb(0, 0, 0)
-	bcolor = rgb(255, 255, 255)
-	lcolor = rgb(106, 90, 205)
-end
-
-'<center><b><font color = maroon>City station toilets</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
-''
-
-act 'Return to the station hall': minut += 1 & gt'vokzalholle'
-
-act 'Look in the mirror': gt 'mirror', 'start'
-if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-
-dynamic $tampon
-dynamic $quickwash
-dynamic $basin
-dynamic $removepan
-
---- vokzaltoilet ---------------------------------
-

+ 0 - 102
locations/vokzaltorg.qsrc

@@ -1,102 +0,0 @@
-# vokzaltorg
-cls
-minut += 30
-prodskill = pcs_apprnc/4 + pcs_sprt + pcs_dom
-
-if prodskill < 20:prodskill = 20
-if prodskill > 150:minimumtov = 3
-if prodskill > 100 and prodskill <= 150:minimumtov = 2
-if prodskill < 100:minimumtov = 1
-
-tovarand = rand(minimumtov, prodskill / 10)
-
-if tovarand > tovarL:tovarand = tovarL
-
-tovpay = tovarand * 300
-money += tovpay
-tovarL -= tovarand
-sprt_exp += rand(0, 1)
-TorgVokzalTimes += 1
-pcs_dom += 1
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/peron.jpg"></center>'
-'You manage to sell <<tovarand>> trinkets to passengers today, while earning <<tovpay>> <b>₽</b>.'
-
-act 'Leave':
-	cls
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-	if pcs_intel + pcs_prcptn > 80 and rand(0,5) = 5:
-		'Two police officers had been keeping an eye on you while you were trying to sell your goods, and when you move to leave the platform they move to intercept you, but you time your leaving with a large group of students and hide yourself amongst them. The police officers get caught up in the crowd and your route clear opens up.'
-
-		act 'Leave':minut += 1 & gt 'vokzalGin'
-	exit
-
-	else
-		'Two police officers had been keeping an eye on you while you were trying to sell your goods, and when you move to leave the platform they approach you. Captain Katalkin says: "Excuse me miss, we saw you were attempting to sell items to passengers. Do you have the proper permits for that? We need to see your papers."'
-	end
-
-	if money >= 500:
-		act 'Bribe them (500 <b>₽</b>)':
-			cls
-			money -= 500
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-			'You smile at them: "Permits, officer? Of course I have the permits, one moment..."'
-			'You look around and, when you''re sure the coast is clear, stick out your hand with a 500 <b>₽</b> note in it.'
-			'The police officers smile at you and quickly take the money before they walk away: "I see everything''s in order. Have a nice day, miss."'
-
-			act 'Leave':minut += 1 & gt 'vokzalGin'
-		end
-	end
-
-	act 'Beg him to forgive you':
-		cls
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-		'You show him your best innocent face and say: "Please sir, times are tough! I''ll get the permit, I''m sorry! Please let me go, I promise it won''t happen again!"'
-
-		if katalkinSexOnce = 0:
-			schtraf = 500
-			'Captain Katalkin grins at you: "We''ll see... come with me to the police station, we''ll have to have a little chat about this."'
-
-			act 'Go to the police station':minut += 5 & katalkinNoexit = 1 & gt 'katalkin'
-		else
-			if katalkinSexDay+7 >= daystart:
-				'Captain Katalkin recognizes you and grins, remembering his recent adventures with you: "You again? Well okay, go on then, run along."'
-
-				act 'Thank him and leave':minut += 1 & gt 'vokzalGin'
-			elseif katalkinSexDay + 7 < daystart:
-				'Captain Katalkin suddenly recognizes you and frowns: "<<$pcs_nickname>>? You haven''t come to see me in a long time... I thought we had an agreement. Are you avoiding me?"'
-
-				act 'No you haven''t!':
-					cls
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-					'You blurt out a mixture of protests and apologies: "No sir! I''ve just been busy, that''s all... I''m sorry."'
-					'Captain Katalkin''s face brightens: "We can fix that. You''re coming with me to the police station now. I think I need to perform a thorough cavity search, to make sure you''re not smuggling anything."'
-					'He firmly puts his hand on your shoulder, and begins to walk towards the police station.'
-
-					act 'Blush and let him guide you':minut += 5 & katalkinNoexit = 1 & gt 'katalkin'
-				end
-			end
-		end
-	end
-
-	act 'Admit you have no permit':
-		cls
-		money = 0
-		tovarL = 0
-		minut += 120
-		pcs_mood = 5
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/katalkin/katalkin.jpg"></center>'
-		'You decide to come clean to them, and admit you don''t have the required papers. The policemen do what you expected. They take you to the police station and confiscate all of your money and items, even the money that you didn''t earn by selling souvenirs. You try to object, but they don''t listen and tell you you''re lucky to not end up in jail for this. After two hours and a stern talking-to about the importance of permits, you''re free to go. You feel terrible.'
-
-		act 'Leave the police station':minut += 1 & gt'vokzalGin'
-	end
-end
-
---- vokzaltorg ---------------------------------
-