Sfoglia il codice sorgente

Merge remote-tracking branch 'Blatte/master'

KevinSmarts 5 anni fa
parent
commit
d3fff941de

File diff suppressed because it is too large
+ 263 - 208
locations/brother.qsrc


+ 6 - 3
locations/pavtrain.qsrc

@@ -19,11 +19,14 @@ end
 
 clr
 gs 'stat'
-'<center><h4>Pavlovsk''s train station</h4></center>'
+'<center><h2>Pavlovsk''s train station</h2></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+*nl
 'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>, in which you can find Pavlovsk''s police station. 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','') + '.'
+*nl
 'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pavtrain_market'', ''start''">market</a> on most days.'
-'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.'
+*nl
+'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. Always on the look out for maids among the local girl population.'
 
 if dimaRevChoice = 5 and dimaRevenge = 4 and dimaTrain = 0:
 	gt 'dimaRevenge', dimaRevenge
@@ -50,7 +53,7 @@ if kidaloa = 0:
 			gs 'stat'
 			'<center><h4>Pavlovsk''s train station</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
-			'You happily take the box from the girl''s hands as the man starts filming. The girl holds the microphone closer to her mouth, and invites you to give some shoutouts to relatives and friends while you''re on TV. Then she points the microphone at you. You gladly accept the invitation and address your friends and family enthusiastically while looking at the camera, sincerely hoping you did not leave anyone out. Then the man turns the camera away for a second.'
+			'You happily take the box from the girl''s hands as the man starts filming. The girl holds the microphone closer to her mouth, and invites you to give some shout-outs to relatives and friends while you''re on TV. Then she points the microphone at you. You gladly accept the invitation and address your friends and family enthusiastically while looking at the camera, sincerely hoping you did not leave anyone out. Then the man turns the camera away for a second.'
 			'The girl tells you: "Unfortunately, the government doesn''t just let us give away items for nothing. We''re legally obligated to have our winners pay VAT over the amount of money their gift is worth. In your case, this comes down to 5000 <b>₽</b>."'
 
 			act 'Pay the VAT and check out your new laptop':

+ 148 - 100
locations/pavtrain_market.qsrc

@@ -26,26 +26,27 @@ if $ARGS[0] = 'start':
 
 	clr
 	gs 'stat'
-	'<center><h4>Market</h4></center>'
+	'<center><h2>Market</h2></center>'
 	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinokw.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinok.jpg"></center>'
 	end
+	*nl
 	'This small open air market is located near the train station.'
 	if arturQW = 1 and (week = 6 or week = 7) and hour < 12:
 		act 'Wait for Aurel to arrive':hour = 12 & gt 'pavtrain_market', 'start'
 	end
-
+	*nl
 	if hour >= 8 and hour <= 18:
-		'In the market the sellers of goods are beckoning shoppers.'
+		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
 		if pav_slut >= 50 and rand(0,9) = 0:
 			'An Armenian man comes up to you and in broken Russian says, "You girl who like men, no? Come meet real men have good time."'
 			act 'Go with him':gt 'gevent', '3'
 			act 'Reject him':
 				menu_off = 1
-				cla
-				'You pretend not to understand what he is saying.'
+				*clr & cla
+				'You pretend not to understand what he is saying, smiling and shaking your head as you move away from him.'
 				act 'Return':gt 'pavtrain_market', 'start'
 			end
 			
@@ -74,7 +75,7 @@ if $ARGS[0] = 'start':
 		if gobelen > 0 and gobQW = 0:
 			act'Sell ​​tapestry':
 				menu_off = 1
-				cls
+				*clr & cla
 				gobQW = 1
 				minut += 15
 				gs'stat'
@@ -87,7 +88,7 @@ if $ARGS[0] = 'start':
 		if gobelen > 0 and gobQW >= 1:
 			act'Sell ​​tapestry':
 				menu_off = 1
-				cls
+				*clr & cla
 				minut += 15
 				gs'stat'
 				'You go to the man who offered to buy your tapestries for 1000 <b>₽</b>. You find him by his stall, smiling.'
@@ -100,7 +101,7 @@ if $ARGS[0] = 'start':
 					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
 				end
 				act'Show your tapestry':
-					cls
+					*clr & cla
 					gobelen -= 1
 					money += 1000
 					gs'stat'
@@ -109,7 +110,7 @@ if $ARGS[0] = 'start':
 				end
 				if gobelen > 1:
 					act'Sell all of your tapestries':
-						cls
+						*clr & cla
 						kolgob = gobelen
 						gobelen = 0
 						moneyGob = kolgob*1000
@@ -123,64 +124,66 @@ if $ARGS[0] = 'start':
 			end
 		end
 		if ShowerIvan = 5 and porndeal = 0 and rand(1,10) <= 4 and lookwine ! daystart:
-			*clr
-			cla
+			*clr & cla
 			gs 'stat'
 			minut += 20
 			menu_off = 1
 			lookwine = daystart
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/chinese_stall01.jpg"></center>'
 			'You were looking through the market when you came upon a stall selling Chinese foods. On a shelf behind the old woman minding the stall there are a number of bottles.'
-			act 'Ask about huangjiu':
+			act 'Ask about wang-goo':
 				cla
 				'You asked the old woman if she has any rice wine to sell. She smiles at you and points to a basket filled with rice.'
-				'"Onry 2 kopec, hundred glam." she said in badly accented Russian, "You buy?"'
-				'"No," you replied, "I need rice wine, rice wine."'
-				'She looked at you in confusion for a moment then suddenly brightened, "Ah!" she exclaimed, "Come, come!"'
-				'The old woman hurried to the other side of the stall and you followed her to where a number of smoked piglets hung in a row.'
-				'"Here," the old woman crowed handing you one of r the pigs, "Nice swine, vely nice swine."'
-				'"No, not nice swine," you cried in dispair, "Rice. Wine."'
-				'"Yes, yes," the woman countered, "Nice swine, only 5 lubles."'
-				'Just as you were about to give up, a young Chinese boy about your brother''s age arrived.'
-				'"I am sorry, my grandmother does not speak much Russian." he said as he stepped up beside the old woman who started to speak rapidly to him in what you assumed was Chinese.'
-				'"My grandmother asks why you don''t like the piglets." he translated as the old woman stopped speaking.'
-				'"I don''t want a pig," you replied in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
-				'"Ah, huangjiu!" he said in understanding then spoke to his grandmother in Chinese.'
-				'The old woman glared at you then hung the smoked pig back on its hook. She shuffled over to the shelf with the bottles and peered short-sightedly at the labels. She finally picked up one of them and brought it over to you.'
-				'"Why you not say wanted lice wine." she asked in aggrieved tones, "500 lubles."'
+				'"Onry 2 <b>₽</b>, hundred glam." she said in badly accented Russian, "You buy?"'
+				'"No," you reply, "I need rice wine, rice wine."'
+				'She looks at you in confusion for a moment then suddenly brightened, "Ah!" she exclaims, "Come, come!"'
+				'The old woman hurries to the other side of the stall as you follow her to where a number of smoked piglets are hung in a row.'
+				'"Here," the old woman crowed handing you one of the pigs, "Nice swine, vely nice swine."'
+				'"No, not nice swine," you sigh out in despair, "Rice! Wine."'
+				'"Yes, yes," the woman counters, "Nice swine, only 5 <b>₽</b>."'
+				*nl
+				'Just as you were about to give up, a young Chinese boy about your brother''s age arrives.'
+				'"I am sorry, my grandmother does not speak much Russian." he says as he steps beside the old woman who started to speak rapidly to him in what you assume is Chinese.'
+				'"My grandmother asks why you don''t like the piglets?" he translates as the old woman stops.'
+				'"I don''t want a pig," you reply in relief as his Russian is quite good, "I am looking for rice wine, wang-goo."'
+				'"Ah, huangjiu!" he exclaims as he turns to his grandmother and starts speaking in Chinese.'
+				'The old woman glares at you, hangs back the smoked pig and shuffles over to the shelf with the bottles. She finally picks up one of them and brings it over to you.'
+				'"Why you not say wanted lice wine." she asked in aggrieved tones, "500 <b>₽</b>."'
 				if money >= 500:
 					act 'Buy the wine':
-						cla
+						*clr & cla
 						money -= 500
 						ricewine = 1
 						'You hand the woman the money and she gives you the wine.'
 						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.'
+					'You are chocked by the high price and realize that you cannot afford the wine. You apologize and turn away.'
+					
 					act 'Leave the market': gt 'pavtrain_market', 'start'
+					
 					act 'Continue browsing the market':
-						*clr
-						cla
+						*clr & cla
 						gs 'stat'
 						minut += 15
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/market_boy01.jpg"></center>'
-						'You continued to wander through the market for another 15 minutes when the boy from the Chinese stall came up to you.'
-						'"Hey, you really want that rice wine?" he asked after checking to make sure no one was watching.'
-						'"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.'
+						'You continue to wander through the market for another 15 minutes when the boy from the Chinese stall comes up to you.'
+						'"Hey, you really want that rice wine?" he asks after checking to make sure that no one is watching.'
+						'"Yes," you answer him, "But it''s too expensive. I can''t afford it."'
+						'"How about we make a deal." he says, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
+						if pornmarkonce = 0: pornmarkonce = 1 & '"Where can I find the porn dealer?" you ask and he happily gives you directions.'
+						
 						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
+						
 						act 'Refuse':
-							'You declined his offer and he shrugged and walked away.'
+							'You decline his offer as he upsettingly walks away.'
 							act 'Leave': gt 'pavtrain_market', 'start'
 						end
 					end
 				end
 			end
 		elseif ShowerIvan = 5 and lookwine ! daystart:
-			cla
-			*clr
+			*clr & cla
 			menu_off = 1
 			gs 'stat'
 			lookwine = daystart
@@ -190,32 +193,31 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/grinok.jpg"></center>'
 			end
 			'You look around the market, but the Chinese vendors don''t seem to be here today.'
+			
 			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 		if porndeal = 1 and porndealday ! daystart:
-			*clr
-			cla
+			*clr & cla
 			menu_off = 1
 			gs 'stat'
 			porndealday = daystart
 			lookboy = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/market_boy01.jpg"></center>'
-			'The boy from the Chinese stall comes up to you as you entered the market.'
-			'"Do you have it?" he asked eagerly.'
+			'The boy from the Chinese stall comes up to you as you enter the market.'
+			'"Do you have it?" he asks eagerly.'
 			if haveporn = 1: 
 				porndeal = 2 & ! to close the ricewine event
 				ricewine = 1
-				'"Do you have the wine?" you countered.'
+				'"Do you have the wine?" you counter.'
 				'He pulls the bottle out of his backpack and you trade items.'
 				act 'Leave': gt 'pavtrain_market', 'start'
 			else
-				'You told him you didn''t have his magazine yet but you were working on it.'
+				'You tell him that you haven''t had time to pick up the magazine yet but you were working on it.'
 				act 'Leave': gt 'pavtrain_market', 'start'
 			end 
 		end
 		if porndeal = 1 and porndealday = daystart and lookboy = 0:
-			cls
-			cla
+			*clr & cla
 			menu_off = 1
 			gs 'stat'
 			lookboy = 1
@@ -230,9 +232,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'events':
-	cls
-	cla
-	'<center><h4>Market</h4></center>'
+	'<center><h2>Market</h2></center>'
+	*clr & cla
 	minut += 10
 	menu_off = 1
 	gs 'stat'
@@ -246,55 +247,57 @@ if $ARGS[0] = 'events':
 		$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[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[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>'
+		*nl
 		'As you are strolling through the market, ' + $pavtrain_market_text[rand(3,12)]
 		killvar '$pavtrain_market_text'
 	end
 end
 
 if ARGS[0] = 1:
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika1.jpg"></center>'
 	'You are strolling through the market when a beggar asks you for some change.'
 	act 'Don''t give money': 
-		cla
-		*clr
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/poproshaika2.jpg"></center>'
-		'You ignore the begger and pretend not to hear him.'
+		'You ignore the beggar and pretend not to hear him.'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 	act 'Give some money': 
-		cla
-		*clr
+		*clr & cla
 		money -= rand(3,20)
 		pcs_willpwr += 5
 		pcs_mood += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/podaet.jpg"></center>'
-		'You give the beggar a few rubles'
+		'You give the beggar a few rubles which he kindly thanks you for.'
 		act 'Wander around the market': gt 'pavtrain_market','events'
 	end
 end
 
 if ARGS[0] = 2:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
-	'You see an old man playing the guitar.'
+	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
 end
 
 if ARGS[0] = 3:
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	if month >= 11 or month <= 3:
@@ -340,8 +343,7 @@ if ARGS[0] = 3:
 end
 
 if ARGS[0] = 4:
-	cla
-	*clr
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
@@ -357,7 +359,7 @@ if ARGS[0] = 4:
 			delact 'Buy cards'
 			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.'
+			'You try not to look into the eyes of the porn dealer as you count the money. You quickly grab the cards and shove them in your purse.'
 			act 'Leave':gt 'pavtrain_market', 'start'
 			act 'Buy something else':gt 'pavtrain_market', 4
 		end
@@ -371,7 +373,7 @@ if ARGS[0] = 4:
 				haveporn = 1
 				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.'
+				'You try your best not to look into the eyes of the porn dealer as you count the money. You take the magazine and quickly hide it.'
 				act 'Leave':gt 'pavtrain_market', 'start'
 				act 'Buy something else':gt 'pavtrain_market', 4
 			end
@@ -385,7 +387,7 @@ if ARGS[0] = 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.'
+				'You look over the magazine covers, covered in images of half-naked girls on them. Many of them appear to be near your own age. The porn dealer notices your interest and looks at you expectantly.'
 				act 'Look through a magazine':
 					cla
 					'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.'
@@ -423,7 +425,7 @@ if ARGS[0] = 4:
 					act 'Leave':gt 'pavtrain_market', 'start'
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
-						act 'Buy magazine':
+						act 'Buy magazine (400 <b>₽</b>)':
 							cls
 							minut += 5
 							money -= 400
@@ -438,14 +440,14 @@ if ARGS[0] = 4:
 					end
 				end
 			elseif TimesBuyPorno >= 5:
-				'The porn dealer see you approaching. "Ah, my best customer!"'
+				'The porn dealer sees you approaching the stall, "Ah, my best customer! Welcome back!"'
 				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 'pavtrain_market', 'start'
 					act 'Look for something else':gt 'pavtrain_market', 4
 					if money >= 400:
-						act 'Buy magazine':
+						act 'Buy magazine (400 <b>₽</b>)':
 							cls
 							minut += 5
 							money -= 400
@@ -478,7 +480,7 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				if pcs_horny >= 50 and pav_slut < 75:
-					'You buy a dildo and hastily hid it, while your face blushes your embarrassment.'
+					'You buy a dildo and hastily hide it, while your face blushes with embarrassment.'
 				else
 					'You buy a dildo and calmly hide it.'
 				end
@@ -495,7 +497,7 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				if pcs_horny >= 50 and pav_slut < 75:
-					'You buy a vibrator and hastily hid it, while your face blushes your embarrassment.'
+					'You buy a vibrator and hastily hide it, while your face blushes with embarrassment.'
 				else
 					'You buy a vibrator and calmly hide it.'
 				end
@@ -512,7 +514,7 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				if pcs_horny >= 50 and pav_slut < 75:
-					'You buy a butt plug and hastily hid it, while your face blushesd your embarrassment.'
+					'You buy a butt plug and hastily hide it, while your face blushes with embarrassment.'
 				else
 					'You buy a butt plug and calmly hide it.'
 				end
@@ -520,7 +522,7 @@ if ARGS[0] = 4:
 			act 'Leave':gt 'pavtrain_market', 'start'
 			act 'Buy something else':gt 'pavtrain_market', 4
 		end
-		act 'Buy strapon harness (1000 <b>₽</b>)':
+		act 'Buy strap-on harness (1000 <b>₽</b>)':
 			cla
 			if money >= 1000 and strapon = 0:
 				minut += 5
@@ -529,9 +531,9 @@ if ARGS[0] = 4:
 				pcs_horny += 10
 				TimesBuyPorno += 1
 				if pcs_horny >= 50 and pav_slut < 75:
-					'You buy a strapon harness and hastily hid it, while your face blushes your embarrassment.'
+					'You buy a strap-on harness and hastily hide it, while your face blushes with embarrassment.'
 				else
-					'You buy a strapon harness and calmly hide it.'
+					'You buy a strap-on harness and calmly hide it.'
 				end
 			end
 			act 'Leave':gt 'pavtrain_market', 'start'
@@ -541,24 +543,28 @@ if ARGS[0] = 4:
 end
 
 if ARGS[0] = 5:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dedgitara.jpg"></center>'
-	'You see an old man playing the guitar.'
+	'You see an old man playing the guitar. He''s trying to avert as much attention as he can to himself.'
 end
 
 if ARGS[0] = 6:
+	*clr & cla
 	menu_off = 1
+	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/nenavizublyadcigan.jpg"></center>'
 	'You meet a Gypsy woman. She offers to tell your fortune.'
 	act 'Agree':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gadaet'+rand(1,2)+'.jpg"></center>'
 		'You agree and Gypsy takes your hand before she predicts you will have great happiness and lots of money. Afterwards, she promptly walks away.'
 		act 'Something''s wrong':
-			cla
-			*clr
+			*clr & cla
 			money = 0
 			pcs_mood -= 50
 			gs 'stat'
@@ -576,12 +582,15 @@ if ARGS[0] = 6:
 end
 
 if ARGS[0] = 7:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/kosmetic.jpg"></center>'
 	tovpay = 800
 	'You see some cosmetics on sale for <<tovpay>> <b>₽</b>.'
 	if money >= tovpay:
-		act 'Buy':
+		act 'Buy the cosmetics (800 <b>₽</b>)':
 			cls
 			minut += 15
 			money -= tovpay
@@ -593,12 +602,15 @@ if ARGS[0] = 7:
 end
 
 if ARGS[0] = 8:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vitaminki.jpg"></center>'
 	tovpay = 105
 	'You see some vitamins on sale for <<tovpay>> <b>₽</b>.'
 	if money >= tovpay:
-		act 'Buy':
+		act 'Buy vitamins (105 <b>₽</b>)':
 			cls
 			minut += 15
 			vitamin += 20
@@ -609,12 +621,15 @@ if ARGS[0] = 8:
 end
 
 if ARGS[0] = 9:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/condoms.jpg"></center>'
 	tovpay = 80
 	'You see a booth selling condoms for <<tovpay>> <b>₽</b>.'
 	if money >= tovpay:
-		act 'Buy':
+		act 'Buy condoms (80 <b>₽</b>)':
 			cls
 			minut += 15
 			prezik += 5
@@ -630,12 +645,15 @@ if ARGS[0] = 9:
 end
 
 if ARGS[0] = 10:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/balzam.jpg"></center>'
 	tovpay = 100
 	'There is lip balm on sale for <<tovpay>> <b>₽</b>.'
 	if money >= tovpay:
-		act 'Buy':
+		act 'Buy lip balm (100 <b>₽</b>)':
 			cls
 			minut += 15
 			lipbalm += 30
@@ -646,7 +664,10 @@ if ARGS[0] = 10:
 end
 
 if ARGS[0] = 11:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	if arturKnow = 0:
 		'Someone suddenly calls out to you, "Hey pretty girl, do you want a fresh, juicy tangerine?"'
 		act 'Look': gt 'arturRinok','start'
@@ -657,7 +678,10 @@ if ARGS[0] = 11:
 end
 
 if ARGS[0] = 12:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/cheburek.jpg"></center>'
 	'Walking through the market, you came across an old woman selling pies.'
 	if pcs_energy <= 80:
@@ -674,7 +698,7 @@ if ARGS[0] = 12:
 			minut+=10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/eat.jpg"></center>'
-			'You ate a delicious pie with pleasure.'
+			'The pie is still warm as the woman hands it over to you. Barely able to keep yourself away from it, you find a place to sit down and enjoy the pie.'
 			act 'Continue walking through the market': gt 'pavtrain_market','events'
 		end
 	else
@@ -683,36 +707,39 @@ if ARGS[0] = 12:
 end
 
 if ARGS[0] = 13:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dropwallet.jpg"></center>'
-	'You see woman ahead of you drop her purse.'
+	'You see a wallet fall out of a woman''s purse.'
 	cla
 	act 'Tell her':
-		cla
-		*clr
+		*clr & cla
 		minut += 2
+		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/vernutwallet.jpg"></center>'
 		'You call to the woman and hold out her wallet. She looks at you and releasing she gratefully takes her wallet back and walks away.'
 		act 'Continue walking through the market': gt 'pavtrain_market','events'
 	end
 	act 'Look through the purse':
-		cla
-		*clr
+		*clr & cla
 		minut += 5
+		gs 'stat'
 		i = rand(40,200)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/zaglanut.jpg"></center>'
-		'In the purse is <<i>> <b>₽</b>'
+		'You open the wallet and you see that there''s <<i>> <b>₽</b>'
 		act 'Take the money and throw away the wallet':
-			cla
-			*clr
+			*clr & cla
 			money += i
 			pcs_mood += 10
+			gs 'stat'
 			gt 'pavtrain_market', 'start'
 		end
 		act 'Catch up with the woman and return her purse':
-			cla
-			*clr
+			*clr & cla
 			pcs_mood += 5
+			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/proverka.jpg"></center>'
 			'You catch up with the woman and telling her she dropped something you hand her the purse. The woman checks her money is still there and seeing that everything is in place, she thanks you and walked away.'
 			act 'Continue walking through the market': gt 'pavtrain_market','events'
@@ -721,32 +748,50 @@ if ARGS[0] = 13:
 end
 
 if ARGS[0] = 14:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rebenok.jpg"></center>'
 	'You see a young mother and her crying baby.'
 end
 
 if ARGS[0] = 15:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/rezba.jpg"></center>'
 	'You find a stall with beautiful things carved out of wood and metal.'
 end
 
 if ARGS[0] = 16:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/gruzchik.jpg"></center>'
-	'Looking around, you almost collided with a man pulling a small cart.'
+	'Looking around, you almost collide with a man pulling a small cart.'
 end
 
 if ARGS[0] = 17:
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/meatlavka.jpg"></center>'
-	'You wandered past a the meet seller and see a butcher working with an axe.'
+	'You wander past a the meet seller and see a butcher working with an axe.'
 end
 
 if ARGS[0] = 18:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/dirka.jpg"></center>'
 	'As you walk past a stall you notice a small hole torn in the canvas.'
 	act 'Look through the hole':
-		cla
-		*clr
+		*clr & cla
 		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 ' + $pavtrain_marketrandtext[rand(3,7)]
@@ -755,12 +800,15 @@ if ARGS[0] = 18:
 end
 
 if ARGS[0] = 19:
+	*clr & cla
 	menu_off = 1
+	minut += 5
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/birthcontrolpills.jpg"></center>'
 	tovpay = 1500
 	'You see a booth selling birth control pills for <<tovpay>> <b>₽</b>.'
 	if money >= tovpay:
-		act 'Buy':
+		act 'Buy birth control pills (1500 <b>₽</b>)':
 			cls
 			minut += 15
 			tabletki += 1

+ 25 - 23
locations/pavtrainhall.qsrc

@@ -15,25 +15,25 @@ if $ARGS[0] = '':
 	gs 'stat'
 	gs 'themes', 'indoors'
 
-	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><h2>Pavlovsk train station interior</h2></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: 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.'
+	*nl
+	'Stepping into the station building you are greated by a large waiting room, where passengers await the trains. In one of the corners you can clearly see the <a href="exec: gt ''pavtrainhall_events'', ''manager''">station manager''s office</a>. The <a href="exec:minut += 1 & gt ''pavtrainhall'', ''toilet''">toilets</a> are located farthest back of the building.'
+	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
-
 	*nl
 	if katalkinSexOnce = 1:'There is a small <a href="exec:minut += 5 & gt ''katalkin''">police station</a> inside the station building.'
-
 	*nl
 	if StoryLine = 1 and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:
 			'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
 		end
 	end
-
+	*nl
 	if podbros = 0:
 		podrand = rand(0, 1)
 
-		if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 0:'As you walk through the station building, you notice a man''s thick <a href="exec: gt ''pavtrainhall_events'', ''wallet1''">wallet</a> 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> fall out from his pocket, not far away from you.'
 		*nl
 	end
 
@@ -59,7 +59,7 @@ if $ARGS[0] = '':
 			act 'Collect your salary':
 				menu_off = 1
 				*clr & cla
-				'<center><h4>Pavlovsk train station interior</h4></center>'
+				'<center><h2>Pavlovsk train station interior</h2></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 				cleZarplatDay = daystart
 				vokzalVork += 1
@@ -125,10 +125,11 @@ if $ARGS[0] = 'platform':
 	*clr & cla
 	gs'stat'
 
-	'<center><H4>Pavlovsk station platforms</H4></center>'
+	'<center><h2>Pavlovsk station platforms</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/pavplat.jpg"></center>'
+	*nl
 	'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.'
-	
+	*nl
 	if week >= 6 and hour >= 9 and hour <= 10:
 		'You notice <a href="exec:gt ''gschool_socialchg1'', ''tBella''">Bella</a> standing at the train station platform, looking at the time table.'
 	end
@@ -136,22 +137,22 @@ if $ARGS[0] = 'platform':
 	act 'Enter the station building': gt'pavtrainhall'
 
 	if Trainpass_day > daystart:
-		act 'Take a train to the old town': gt 'pavtrainhall', 'oldtown'
+		act 'Take the train to the old town': gt 'pavtrainhall', 'oldtown'
 
-		act 'Take a train to the village of Gadukino': gt 'pavtrainhall', 'village'
+		act 'Take the train to the village of Gadukino': gt 'pavtrainhall', 'village'
 
-		act 'Take a train to the communal village': gt 'pavtrainhall', 'communal'
+		act 'Take the train to the communal village': gt 'pavtrainhall', 'communal'
 
-		act 'Take a train to city industrial area': gt 'pavtrainhall', 'ind'
+		act 'Take the train to city industrial area': gt 'pavtrainhall', 'ind'
 
-		act 'Take a train to city center': gt 'pavtrainhall', 'centre'
+		act 'Take the train to city center': gt 'pavtrainhall', 'centre'
 	end
 end
 
 if $ARGS[0] = 'work':
 	menu_off = 1
 	*clr & cla
-	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><h2>Pavlovsk train station interior</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	if cleZalDay ! daystart:
 		act 'Mop the waiting room floor (1:00)':
@@ -161,7 +162,7 @@ if $ARGS[0] = 'work':
 			pcs_mood -= 6
 			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 wash the floor in the waiting room.'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and mop the station building floor.'
 
 			act 'Continue':minut += 1 & gt 'pavtrainhall', 'work'
 		end
@@ -175,7 +176,7 @@ if $ARGS[0] = 'work':
 			pcs_mood -= 6
 			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.'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and head into the men''s restroom.'
 			gs 'pavtrainhall_events', 'toilet_event'
 			!!'You began to wash the floor in the men''s room, and then began to scrub toilets.'
 
@@ -191,7 +192,7 @@ if $ARGS[0] = 'work':
 			pcs_mood -= 6
 			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.'
+			'You take some cleaning supplies from the maintenance closet, pour some water and soap into a bucket and scrub the toilets in the ladies'' restroom before you finish up by mopping the floor.'
 			gs 'pavtrainhall_events', 'vera'
 
 			act 'Leave restroom':minut += 1 & gt 'pavtrainhall', 'work'
@@ -206,7 +207,7 @@ if $ARGS[0] = 'ticket':
 	menu_off = 0
 	*clr & cla
 	gs 'stat'
-	'<center><h4>Ticket office</h4></center>'
+	'<center><h2>Ticket office</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/kassa.jpg"></center>'
 
 	act 'Leave the ticket office':minut += 1 & gt 'pavtrainhall'
@@ -371,9 +372,10 @@ if $ARGS[0] = 'toilet':
 	vokzalToilet = 0
 	gs 'stat'
 
-	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><h2>Pavlovsk train station interior</h2></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.'
+	*nl
+	'You stand by the station''s restrooms, you see the <a href="exec:minut += 1 & gt ''pavtrainhall'', ''female''">ladies'' restroom</a> to the right and <a href="exec:minut += 1 & gt ''pavtrainhall'', ''male''">men''s restroom</a> to the left, clearly marked by signs on the door.'
 
 	act 'Return to the train station':minut += 1 & gt 'pavtrainhall'
 end
@@ -392,7 +394,7 @@ if $ARGS[0] = 'female':
 	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.'
+	'You open the door to the ladies'' restroom and head inside.'
 
 	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
 
@@ -418,7 +420,7 @@ if $ARGS[0] = 'male':
 	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.'
+	'You open the door to the men''s restroom and head inside.'
 
 	act 'Leave':minut += 1 & gt 'pavtrainhall', 'toilet'
 

+ 32 - 32
locations/pavtrainhall_events.qsrc

@@ -1,26 +1,26 @@
 # pavtrainhall_events
 
 if $ARGS[0] = 'manager':
-	cls
+	*clr & cla
 	menu_off = 1
 	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"'
+	'As 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 the station manager for more information."'
+	'"Office visiting 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
+			*clr & cla
 			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?"'
+			'You knock on the door and enter the station manager''s office. An elderly man looks up from his papers on his desk and says, "Can I help you?"'
 
 			act 'Apologize and leave':minut += 1 & gt 'pavtrainhall'
 
 			if vokzalVork = 0:
 				act 'Apply for the cleaning job':
-					cls
+					*clr & cla
 					vokzalVork = 1
 					minut += 15
 					gs 'stat'
@@ -37,17 +37,17 @@ if $ARGS[0] = 'manager':
 end
 
 if $ARGS[0] = 'wallet1':
-	cls
+	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><h4>Pavlovsk train station interior</h4></center>'
+	'<center><h2>Pavlovsk train station interior</h2></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
+		*clr & cla
 		gs 'stat'
-		'<center><h4>Pavlovsk train station interior</h4></center>'
+		'<center><h2>Pavlovsk train station interior</h2></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!"'
@@ -58,9 +58,9 @@ if $ARGS[0] = 'wallet1':
 	act 'Let her have the wallet and leave':minut += 1 & gt 'pavtrainhall'
 
 	act 'Share the money':
-		cls
+		*clr & cla
 		gs 'stat'
-		'<center><h4>Pavlovsk train station interior</h4></center>'
+		'<center><h2>Pavlovsk train station interior</h2></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!"'
@@ -70,12 +70,12 @@ if $ARGS[0] = 'wallet1':
 end
 
 if $ARGS[0] = 'wallet2':
-	cls
+	*clr & cla
 	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
+		*clr & cla
 		money = 0
 		podbros = 1
 		gs 'stat'
@@ -508,7 +508,7 @@ if $ARGS[0] = 'vera':
 			npc_rel['A27'] += 10
 			gs 'stat'
 			'<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.'
+			'You put your cleaning supplies aside and walk over to Vera to have a chat with her while she also seems to be having a slow day. After a while, the topic ends up being her sex life. Vera complains how her husband doesn''t satisfy her in bed.'
 
 			act 'Leave':minut += 1 & gt 'pavtrainhall'
 		end
@@ -527,7 +527,7 @@ if $ARGS[0] = 'vera':
 			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.'
+		'While you''re on your way to clean the ladies'' restroom, you see the cashier in the ticket office look at you. She gives you a friendly nod while she smokes a cigarette, and you decide you could go for a quick break and have a chat if you feel like it.'
 
 		act 'Chat with the cashier':
 			*clr & cla
@@ -575,7 +575,7 @@ if $ARGS[0] = 'toilet_event':
 
 			if pcs_horny >= 50:
 				act 'Try to sneak a peek':
-					cls
+					*clr & cla
 					minut += 1
 					seepeenach += 1
 					tot_seepee += 1
@@ -585,7 +585,7 @@ if $ARGS[0] = 'toilet_event':
 					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.'
+					'You wash the floor in the men''s restroom, and ponder whether you should move out for a minute when you hear a man loudly empty 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'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'toilet_event':
 
 			if pcs_horny >= 50:
 				act 'Try to sneak a peek':
-					cls
+					*clr & cla
 					minut += 1
 					seepeecop += 1
 					tot_seepee += 1
@@ -609,7 +609,7 @@ if $ARGS[0] = 'toilet_event':
 					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.'
+					'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 empty 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'
@@ -623,7 +623,7 @@ if $ARGS[0] = 'toilet_event':
 
 			if pcs_horny >= 50:
 				act 'Try to sneak a peek':
-					cls
+					*clr & cla
 					minut += 1
 					seepeeman += 1
 					tot_seepee += 1
@@ -633,7 +633,7 @@ if $ARGS[0] = 'toilet_event':
 					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.'
+					'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 empty 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'
@@ -644,12 +644,12 @@ if $ARGS[0] = 'toilet_event':
 			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.'
+		'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 empty 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
+	*clr & cla
 	menu_off = 1
 	minut += 30
 	prodskill = pcs_apprnc/4 + pcs_sprt + pcs_dom
@@ -674,7 +674,7 @@ if $ARGS[0] = 'trinkets':
 	'You manage to sell <<tovarand>> trinkets to passengers today, while earning <<tovpay>> <b>₽</b>.'
 
 	act 'Leave':
-		cls
+		*clr & cla
 		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:
@@ -684,16 +684,16 @@ if $ARGS[0] = 'trinkets':
 		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."'
+			'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 permit for that? We need to see your papers."'
 		end
 
 		if money >= 500:
 			act 'Bribe them (500 <b>₽</b>)':
-				cls
+				*clr & cla
 				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 smile at them: "Permit, officer? Of course I have the permit, 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."'
 
@@ -702,7 +702,7 @@ if $ARGS[0] = 'trinkets':
 		end
 
 		act 'Beg him to forgive you':
-			cls
+			*clr & cla
 			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!"'
@@ -721,7 +721,7 @@ if $ARGS[0] = 'trinkets':
 					'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
+						*clr & cla
 						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."'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'trinkets':
 		end
 
 		act 'Admit you have no permit':
-			cls
+			*clr & cla
 			money = 0
 			tovarL = 0
 			minut += 120

Some files were not shown because too many files changed in this diff