Renamed city marketplace files

rinok->city_market, 
rinwork->city_marketwork, 
RynokHoz->city_marketsex

locations/rinok.qsrc → locations/city_market.qsrc

@@ -1,4 +1,4 @@
-# rinok
+# city_market
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start' or $metka = 'start':
 	CLOSE ALL
@@ -18,8 +18,8 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	minut = minut + 5
 	mag = 1
 	$metka = 'start'
-	$loc = 'rinok'
-	$menu_loc = 'rinok'
+	$loc = 'city_market'
+	$menu_loc = 'city_market'
 	$menu_arg = 'start'
 	
 	'<center><b><font color="maroon">Marketplace</font></b></center>'
@@ -34,14 +34,14 @@ if $ARGS[0] = 'start' or $metka = 'start':
 		''
 	end
 	*pl '<center><table align="center" width=80%>'
-	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'rinok')
-	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'rinok')
-	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'rinok')
-	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'rinok')
-	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'rinok')
-	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'rinok', '', iif(bag > 0, 0, 1), 'You need a purse')
+	*P FUNC ('$stock_item', 10, 'Dishwashing detergent', 400, 'fairy', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Clothing detergent', 400, 'poroshok', 'city_market')
+	*P FUNC ('$stock_item', 8, 'Plates', 450, 'cltarelka', 'city_market')
+	*P FUNC ('$stock_item', 20, 'Cosmetics', 1000, 'kosmetica', 'city_market')
+	*P FUNC ('$stock_item', 25, 'Razors (number of shaves)', 300, 'stanok', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Tampons', 160, 'tampon', 'city_market')
+	*P FUNC ('$stock_item', 10, 'Sanitary napkins', 80, 'sanpad', 'city_market')
+	*P FUNC ('$single_stock_item', 1, 'Umbrella', 1000, 'umbrella', 'city_market', '', iif(bag > 0, 0, 1), 'You need a purse')
 	'</table></center>'
 	*pl
 	if analplugIN = 1 and $pantyworntype = 'none' and PCloSkirt > 2:
@@ -80,7 +80,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 					'Arthur unloads stuff from his truck and gives them to you. You start hanging the clothes on the stall.'
 					'Before leaving Arthur gives you instructions. "Sell at whatever price you want, but at the end of your shift I will charge you 1000 <b>₽</b> for each item sold. You should be making me no less than <<arturplan>> <b>₽</b>."'
 
-					act 'To work':gt 'rinwork', 'start'
+					act 'To work':gt 'city_marketwork', 'start'
 				end
 			end
 		end
@@ -90,7 +90,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 			workrin = 0
 			'You retired from work and collect papers.'
 
-			act 'Leave':gt 'rinok', 'start'
+			act 'Leave':gt 'city_market', 'start'
 		end
 	end
 
@@ -105,7 +105,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 			'Pay is a percentage of sales, paid at end of shift. Your shifts would be Tuesdays, Thursdays and Saturdays. From 8 till 14.'
 			'Government insist I have your papers, so it would be your main job.'
 
-			act 'Leave':gt 'rinok', 'start'
+			act 'Leave':gt 'city_market', 'start'
 
 			act 'Take the job':
 				cla
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 				arturplan = 5000
 				'You give your papers to Arthur and shaking your hand he welcomes you on board.'
 
-				act 'Leave':gt 'rinok', 'start'
+				act 'Leave':gt 'city_market', 'start'
 			end
 		end
 	end
@@ -136,7 +136,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the book for fantasy 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
@@ -150,7 +150,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the book for science fiction 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
@@ -164,11 +164,11 @@ if $ARGS[0] = 'start' or $metka = 'start':
 
 				'You bought the novel for the ladies 350 <b>₽</b>.'
 
-				act 'Leave':gt'rinok','start'
+				act 'Leave':gt'city_market','start'
 			end
 		end
 
-		act 'Leave':gt'rinok','start'
+		act 'Leave':gt'city_market','start'
 	end
 
 	if coat[5] < 1:
@@ -179,7 +179,7 @@ if $ARGS[0] = 'start' or $metka = 'start':
 	act 'View clothing':
 		cla
 		minut += 5
-		gt 'rinok', 'clo'
+		gt 'city_market', 'clo'
 	end
 end
 
@@ -195,12 +195,12 @@ if $ARGS[0] = 'clo':
 	act 'Return':
 		cla
 		minut += 5
-		gt 'rinok', 'start'
+		gt 'city_market', 'start'
 	end
 
 	i = 15
 	:loopcheap
-	if cheap[i] = 0:*p '<a href="exec: i = <<i>> & gt ''rinok'', ''marketclo''"><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="400" /></a>'
+	if cheap[i] = 0:*p '<a href="exec: i = <<i>> & gt ''city_market'', ''marketclo''"><img <<$set_imgh>> src="images/pc/clothing/1cheap/<<i>>.jpg" 	height="400" /></a>'
 	i += 1
 	if i <= 20:jump 'loopcheap'
 end
@@ -210,7 +210,7 @@ if $ARGS[0] = 'marketclo':
 
 	if cheap[i] ! 0:
 		msg 'You already own these clothes.'
-		gt 'rinok', 'clo'
+		gt 'city_market', 'clo'
 	end
 
 	gt 'clothing', 'view_clothing_item', 'shop', 'cheap',i, 750
@@ -276,5 +276,5 @@ if $ARGS[0] = 'tailor':
 	end
 end
 
---- rinok ---------------------------------
+--- city_market ---------------------------------
 

locations/RynokHoz.qsrc → locations/city_marketsex.qsrc

@@ -1,4 +1,4 @@
-# RynokHoz
+# city_marketsex
 
 ! Sex acts for rinwork (city market working)
 !
@@ -367,5 +367,5 @@ if $ARGS[0] = 'sex':
 end
 
 
---- RynokHoz ---------------------------------
+--- city_marketsex ---------------------------------
 

locations/rinwork.qsrc → locations/city_marketwork.qsrc

@@ -1,4 +1,4 @@
-# rinwork
+# city_marketwork
 $location_type = 'event_outdoors'
 
 ! Variables used
@@ -26,9 +26,9 @@ $location_type = 'event_outdoors'
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'rinwork'
+	$loc = 'city_marketwork'
 	cla & *clr
-	$menu_loc = 'rinwork'
+	$menu_loc = 'city_marketwork'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'start':
 						cla
 						'You start making excuses. Arthur says to you, "Hey, don''t insult me, your stall is dirty, it has dust and dirt all over it. I should fine you, but if you''re nice I will let you off.'
 
-						act 'Go to warehouse':gt 'RynokHoz', 'the_beginning'
+						act 'Go to warehouse':gt 'city_marketsex', 'the_beginning'
 
 						act 'No':
 							cla
@@ -109,19 +109,19 @@ if $ARGS[0] = 'start':
 						end
 					end
 
-					act 'Go with him':gt 'RynokHoz', 'the_beginning'
+					act 'Go with him':gt 'city_marketsex', 'the_beginning'
 					
 				elseif palevorin = 2:
 					'Artur goes behind you into the stall carrying some stuff, then he comes up behind you are working and gives your ass a slap and squeeze. "I am glad you turned Abdul and Hasan down. I like having you all to myself."'
 					'You turn your head to look at him and smile. "I like that too, but maybe from now on you can lock the door first?"'
 					'He laughs and nods. "Of course of course, anything for you my sweet. If you wish the door to be locked from now on the door will be locked from now on. Speaking of which, come let us go try locking the door to make sure it works and have lunch."'
-					act 'Go with Artur':palevorin = 3 & gt 'RynokHoz', 'the_beginning'
+					act 'Go with Artur':palevorin = 3 & gt 'city_marketsex', 'the_beginning'
 					
 				elseif palevorin = 4:
 					'Artur goes behind you into the stall carrying some stuff. He comes up behind you are working and gives your ass a slap and squeeze, with one hand while the other one snakes around and roughly grabs your tit, as he whispers in your ear. "So you like cock, I didn''t think you were a little slut but that''s ok, I like dirty sluts."'
 					'He cuts you off before you can make any protest about being slut. "No it is good, I can use this. Now come let us go to the warehouse so I can fuck you."'
 					
-					act 'Go with him ':palevorin = 5 & gt 'RynokHoz', 'sex'
+					act 'Go with him ':palevorin = 5 & gt 'city_marketsex', 'sex'
 					
 					gs 'willpower', 'sex', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -133,7 +133,7 @@ if $ARGS[0] = 'start':
 							'You see the anger flare up in his eyes. "So you think you are to good for me whore? I gave you a job, I treated you nice and then you fuck those two and now I am not good enough?" He shakes his head. "No get your ass in the warehouse now or you are fired and I will tell Abdul and Hasan they are free to tell everyone about how you greedily took their cocks like the little slut you are."'
 							'You are a bit shocked at this level of anger and the ultimatum. You are unsure what to do, go with him, keep your job, and your rep. Or refuse and find a new job and hope no one believes them.'
 
-							act 'Go to warehouse':palevorin = 5 & gt 'RynokHoz', 'sex'
+							act 'Go to warehouse':palevorin = 5 & gt 'city_marketsex', 'sex'
 
 							gs 'willpower', 'sex', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
@@ -162,11 +162,11 @@ if $ARGS[0] = 'start':
 					if sexgrouprand = 1:
 						'Artur walks up and slaps your ass hard and grabs you roughly by one arm. "Hey bitch, how would you like to make some extra money? My friends need company."'
 						
-						act 'Go with him':gt 'RynokHoz', 'group'
+						act 'Go with him':gt 'city_marketsex', 'group'
 					else
 						'Artur walks up and slaps your ass hard and grabs you roughly by one arm. "Bitch get your fucking ass in the warehouse."'
 						
-						act 'Go with him':gt 'RynokHoz', 'sex'
+						act 'Go with him':gt 'city_marketsex', 'sex'
 					end
 					
 					gs 'willpower', 'sex', 'resist', 'hard'
@@ -177,9 +177,9 @@ if $ARGS[0] = 'start':
 							gs 'stat'
 							'You start making excuses. Arthur says to you, "Hey, don''t insult me you fucking slut, I was there. I know what a whore you are. Now get your fucking ass in the warehouse or the whole town will know what a whore you are."'
 							if sexgrouprand = 1:
-								act 'Go to warehouse':gt 'RynokHoz', 'group'
+								act 'Go to warehouse':gt 'city_marketsex', 'group'
 							else
-								act 'Go to warehouse':gt 'RynokHoz', 'sex'
+								act 'Go to warehouse':gt 'city_marketsex', 'sex'
 							end
 							
 							gs 'willpower', 'sex', 'resist', 'hard'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'start':
 	elseif hour < 14:
 		act 'Laze around (0:15)':
 			minut += 15
-			gt 'rinwork', 'start'
+			gt 'city_marketwork', 'start'
 		end
 
 		if money >= 200:
@@ -241,7 +241,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Hassan opens trunks and puts clothes on the counter.'
 					if talkrand >= 2:'Hassan drags trunks to his stall.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'On the next stall Abdul is talking loudly and giving clothes to saleswoman Anna.'
@@ -254,7 +254,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul slaps Annas ass, she pretends that nothing happened.'
 					if talkrand >= 2:'Abdul drags trunks to his stall.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Abdul and Hassan stand beside your stall and saying something guttural.'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul and Hassan ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to Hassan, "Look at that a girl, she looks like a good fuck, yeah."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'Anna hangs clothes on her stall shouting at Nadia.'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells her how some pervert molested her on the subway rubbing his dick on her ass.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'Arthur is talking about something with Abdullah.'
@@ -297,7 +297,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Abdul and Arthur ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to Arthur, "Nice girl you got there, you fucking her?."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Arthur, Abdul Hassan are talking loudly, about something in foreign language.'
@@ -310,7 +310,7 @@ if $ARGS[0] = 'start':
 					if talkrand = 1:'Armenians ignore you and discuss what sounds like clothes prices.'
 					if talkrand >= 2:'Abdul looks at you and says to the other Armenians, "Pretty little girl, can i have her?"'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -324,7 +324,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Hassan says to Nadia "Nadia, why you refuse? Come here, have some wine."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'At the stall in front of you sits Nadia doing crossword puzzles.'
@@ -335,7 +335,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia leaves the crossword and willingly gossips with you.'
 					
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadias stall in front of you has many buyers and she fusses before them laying out goods.'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'At the next stall Anna is drinking coffee.'
@@ -357,7 +357,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is happy to chat with you about any old nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'At the next stall Anna tries to interest buyers in her goods.'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anya is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Anna is gossiping with Aunt Katya.'
@@ -380,7 +380,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Aunt Katya is talking about her pies and Anya complains that it because of her bloody pies that her ass is twice as big as it was.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -394,7 +394,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'The Armenians seem to be trying to persuade Nadia to have sex with them.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'At the stall in front of you sits Nadia eating cake.'
@@ -410,7 +410,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells you about an office building not too far away that is looking for a cleaner.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadias stall in front of you has many buyers and she fusses before laying out goods.'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'At the next stall Anna is reading a newspaper.'
@@ -432,7 +432,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is happy to chat with you about any old nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'At the next stall Anna tries to interest buyers in her goods.'
@@ -443,7 +443,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anya is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Nadia is approached by three Armenians, Aslan, Camille and Mukhtar and they begin to molest her, she swears at them and tries to dodge.'
@@ -453,7 +453,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'The Armenians seem to be trying to persuade Nadia to have sex with them.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -468,7 +468,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia shies away from talking in front of Hassan.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 1:
 				$rintak = 'Nadia is surrounded by customers.'
@@ -479,7 +479,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 2:
 				$rintak = 'Nadia talks with Anna.'
@@ -499,7 +499,7 @@ if $ARGS[0] = 'start':
 						'Nadia tells her how some pervert molested her on the subway rubbing his dick on her ass.'
 					end
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 3:
 				$rintak = 'Anna  is selling clothing to customers.'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna is not happy, "Shoo, no distractions, I have buyers."'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand = 4:
 				$rintak = 'Anna is drinking coffee sitting at her stall.'
@@ -521,7 +521,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Anna happily chats with you about nonsense.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			elseif rintakrand >= 5:
 				$rintak = 'Nadia is idly trying to catch flies.'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'start':
 					minut += 15
 					'Nadia glad for the distraction and has fun chatting with you.'
 
-					act 'Further':gt 'rinwork', 'start'
+					act 'Further':gt 'city_marketwork', 'start'
 				end
 			end
 
@@ -595,25 +595,25 @@ if $ARGS[0] = 'start':
 				act 'Now this is very fashionable':
 					cla
 					tipred = 3
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'This item is very high quality and reliable':
 					cla
 					tipred = 1
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'You''ll find this very reasonable':
 					cla
 					tipred = 0
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 
 				act 'That is so you':
 					cla
 					tipred = 2
-					gs 'rinwork', 'answerrin'
+					gs 'city_marketwork', 'answerrin'
 				end
 			end
 		end
@@ -632,10 +632,10 @@ if $ARGS[0] = 'answerrin':
 			pokpay = rand(1300, 1500)
 		end
 		'<<$poktip>> asks you for a price'
-		gs 'rinwork', 'tellprice'
+		gs 'city_marketwork', 'tellprice'
 	else
 		'<<$poktip>> puts the item back and leaves.'
-		act 'Further':gt 'rinwork', 'start'
+		act 'Further':gt 'city_marketwork', 'start'
 	end
 end
 
@@ -654,24 +654,24 @@ if $ARGS[0] = 'tellprice':
 				rinvesh += 1
 				'The buyer takes the item and pays <<prodpay>> <b>₽</b>.'
 
-				act 'Sell it':gt 'rinwork', 'start'
+				act 'Sell it':gt 'city_marketwork', 'start'
 			else
 				'The buyer twirls clothing in their hands <<prodpay>> <b>₽</b> is too expensive.'
-				gs 'rinwork', 'haggling'
+				gs 'city_marketwork', 'haggling'
 			end
 		elseif prodpay > pokpay and prodpay <= pokpay + 100:
 			if poknorand >= 10:
 				'The buyer twirls clothing in their hands <<prodpay>> <b>₽</b> is too expensive.'
-				gs 'rinwork', 'haggling'
+				gs 'city_marketwork', 'haggling'
 			else
 				'Buyer puts the item back and leaves'
 
-				act 'Return':gt 'rinwork', 'start'
+				act 'Return':gt 'city_marketwork', 'start'
 			end
 		elseif prodpay > pokpay + 100:
 			'The buyer puts the item back and leaves.'
 
-			act 'Return':gt 'rinwork', 'start'
+			act 'Return':gt 'city_marketwork', 'start'
 		end
 	end
 end
@@ -691,7 +691,7 @@ if $ARGS[0] = 'haggling':
 				'The buyer puts the item back and leaves.'
 			end
 			
-			act 'Haggle':gt 'rinwork', 'start'
+			act 'Haggle':gt 'city_marketwork', 'start'
 		end
 	elseif prodpay >= 1050:
 		act 'Reduce the price by 50 <b>₽</b>':
@@ -707,12 +707,12 @@ if $ARGS[0] = 'haggling':
 				'The buyer puts the item back and leaves.'
 			end
 			
-			act 'Haggle':gt 'rinwork', 'start'
+			act 'Haggle':gt 'city_marketwork', 'start'
 		end
 	end
-	act 'You can not take less, take the item back':gt 'rinwork', 'start'
+	act 'You can not take less, take the item back':gt 'city_marketwork', 'start'
 end
 
 
---- rinwork ---------------------------------
+--- city_marketwork ---------------------------------
 

locations/etoexhib.qsrc

@@ -500,7 +500,7 @@ if $ARGS[0] = 'pos15':
 	'You feel a guy standing behind you, he is a groper and is now intent on touching your ass!'
 	'His hand grabs one of your buttcheeks.'
 
-	act 'Move away':gt 'rinok', 'start'
+	act 'Move away':gt 'city_market', 'start'
 
 	act 'Next':
 		cla
@@ -525,7 +525,7 @@ if $ARGS[0] = 'pos15':
 		'"I''m sorry, I do not work here", you answered.'
 		'The woman must have startled the pervert because when you turned around, he was nowhere to be found.'
 
-		act 'Next':gt 'rinok', 'start'
+		act 'Next':gt 'city_market', 'start'
 	end
 end
 

locations/portnoi2.qsrc

@@ -160,9 +160,9 @@ elseif money >= poshvalldrop:
 end
 
 if $loc = 'pav_factory':
-	act 'Leave': gt 'pavIndustrial'
+	act 'Leave': gt 'pav_industrial'
 else
-	act 'Leave' :gt 'rinok', 'tailor'
+	act 'Leave' :gt 'city_market', 'tailor'
 end
 
 --- portnoi2 ---------------------------------