[fixed] Replaced remaining pav_train gotos with market or train_hall as required

locations/HotelHole.qsrc

@@ -19,7 +19,7 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
-		act 'Go back to the High Street':minut += 3 & gt'pav_train'
+		act 'Go back to the High Street':minut += 3 & gt'pav_market'
 		
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'

locations/camera.qsrc

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

locations/dimaRevenge.qsrc

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

locations/gdksex.qsrc

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

locations/hotel_resep.qsrc

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

locations/olutaxi.qsrc

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

locations/pav_commercial.qsrc

@@ -88,7 +88,7 @@ else
 	$Pharmname = 'For easy access, there''s even a pharmacy attached to it but it''s currently closed for the day.'
 end
 
-'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_train''">train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
+'<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_market''">Market square</a> with the <a href="exec:minut += 10 & gt ''pav_train_hall''">Train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
 
 if week < 6 and hour >= 9 and hour <= 18:
 	$desc_txt4 = '<a href="exec:minut += 3 & gt ''post_office'', ''start''">post office</a>'

locations/pav_disco_sex.qsrc

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

locations/police_station.qsrc

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

locations/set_home.qsrc

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

locations/succubus.qsrc

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