Browse Source

[Chaged] Renamed Island, park and lake to use city_ prefix

KevinSmarts 4 years ago
parent
commit
fc72f41905

+ 2 - 2
locations/KatjaHomeTalk.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = '':
 	!					'- Well will continue our dispute, - asked you '
 	!					'- continue, - Katya readily agreed'
 	!
-	!					act 'Further': gt 'katja_sex','park'
+	!					act 'Further': gt 'katja_sex','city_park'
 	!				end
 	!			end
 				if flag_KissEV = 2:
@@ -165,7 +165,7 @@ if $ARGS[0] = '':
 						'"Oh yea?" Kate said with a bit of anger, "Let''s see then, let''s go to the Park and see who can kiss more boys."'
 						'"Good." You agree, let''s dispute. And what''s the bet.'
 						'"Fine, now let''s go kiss some boys." Kate said.'
-						act 'Further': gt 'katja_sex','park'
+						act 'Further': gt 'katja_sex','city_park'
 					end
 				elseif katjaPreg = 0 or knowKatjaPreg = 1:
 					if KatjaHorny < 50:'Katka talks about school lessons, cosmetics, the latest fashion trends and other very important things.'

+ 1 - 1
locations/Nudelake.qsrc

@@ -98,7 +98,7 @@ if $clothingworntype = 'nude':
 		gs 'underwear', 'wear'
 	end
 else
-	act 'Return to the main beach':gt 'lake', 'start'
+	act 'Return to the main beach':gt 'city_lake', 'start'
 end
 
 if katday ! daystart and npc_rel['A219'] >= 1 and temper >= 15:

+ 4 - 4
locations/ParkKafe.qsrc

@@ -919,7 +919,7 @@ if $ARGS[0] = 'negros':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/walktodorm.jpg"></center>'
 					'Now that you are sure about what they want you decide that you don''t want to be gangbanged by a bunch of college guys. You pretend to check your phone. "Oh, sorry guys, I just noticed the time and I have to go." You slip away from Djibril and walk away from them. You don''t glance back, but you are sure they are unhappy.'
-					act 'Leave': minut += 5 & gt 'island'
+					act 'Leave': minut += 5 & gt 'city_island'
 				end
 				act 'Go to dorm': gt 'dormev1', 'djibrilgb'
 			end
@@ -946,7 +946,7 @@ if $ARGS[0] = 'negros':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/walktodorm.jpg"></center>'
 				'Now that you are sure about what they want you decide that you don''t want to be gangbanged by a bunch of college guys. You pretend to check your phone. "Oh sorry guys, I just noticed the time and I have to go." You slip away from Djibril and walk away from them. You don''t glance back, but you are sure they are unhappy.'
-				act 'Leave': minut += 5 & gt 'island'
+				act 'Leave': minut += 5 & gt 'city_island'
 			end
 			act 'Go to dorm': gt 'dormev1', 'djibrilgb'
 		end
@@ -979,7 +979,7 @@ if $ARGS[0] = 'negros':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/walktodorm.jpg"></center>'
 				'Now that you are sure about what they want you decide that you don''t want to be gangbanged by a bunch of college guys. You pretend to check your phone. "Oh sorry guys, I just noticed the time and I have to go." You slip away from Djibril and walk away from them. You don''t glance back, but you are sure they are unhappy.'
-				act 'Leave': minut += 5 & gt 'island'
+				act 'Leave': minut += 5 & gt 'city_island'
 			end
 			act 'Go to dorm': gt 'dormev1', 'djibrilgb'
 		end
@@ -1191,7 +1191,7 @@ if $ARGS[0] = 'end':
 	elseif $ARGS[1] = 'cafe':
 		gt 'parkKafe', 'start'
 	else
-		gt 'park', 'start'
+		gt 'city_park', 'start'
 	end
 end
 

+ 1 - 1
locations/Prostitute.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'start':
 	act 'Go back to the park':
 		cla
 		minut += 5
-		gt 'park', 'start'
+		gt 'city_park', 'start'
 	end
 end
 

+ 1 - 1
locations/abduction.qsrc

@@ -566,7 +566,7 @@ if $ARGS[0] = 'abdEscapeWindow3':
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'city_industrial'
 	act 'Run right':gt 'pavCommercial'
-	act 'Run forward':gt 'lake', 'start'
+	act 'Run forward':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'abdFood':

+ 1 - 1
locations/cafe_parco.qsrc

@@ -64,7 +64,7 @@ if $args[0]= 'inner':
 							cla
 							'You''re pretty much broke, and you don''t want to be impudent by asking them to pay for you, so you decide to thank them for the invite but that you have a thing elsewhere that you need to attend...'
 
-							act 'Leave': gt 'park'
+							act 'Leave': gt 'city_park'
 						end
 					end
 					act 'Agree':

+ 4 - 4
locations/carF.qsrc

@@ -4,12 +4,12 @@ $enddrive = {
 	if cardrive = 1:gt 'city_residential'
 	if cardrive = 2:gt 'city_center'
 	if cardrive = 3:gt 'city_industrial'
-	if cardrive = 4:gt 'lake', 'start'
-	if cardrive = 5:gt 'park', 'start'
+	if cardrive = 4:gt 'city_lake', 'start'
+	if cardrive = 5:gt 'city_park', 'start'
 	if cardrive = 6:gt 'zaprF', 'start'
 	if cardrive = 7:gt 'autoservisF', 'start'
 	if cardrive = 9:gt 'autotraidF', 'start'
-	if cardrive = 10:gt 'park', 'whore'
+	if cardrive = 10:gt 'city_park', 'whore'
 	if cardrive = 11:gt 'sauna'
 	if cardrive = 12:gt 'obekt'
 	if cardrive = 13:gt 'dachi'	
@@ -21,7 +21,7 @@ $enddrive = {
 	if cardrive = 22:gt 'road'
 	if cardrive = 23:gt 'gadukino'
 	if cardrive = 24:gt 'pavCommercial'
-	if cardrive = 25:gt 'island'
+	if cardrive = 25:gt 'city_island'
 	if cardrive = 26:gt 'pavIndustrial'
 }
 

+ 1 - 1
locations/city_center.qsrc

@@ -113,7 +113,7 @@ else
 	$desc_txt1 = '<a href="exec:msg ''The metro is closed and will reopen at 4:00''">the metro</a>'
 end
 
-'You have easy access to the <a href="exec: minut += 5 & gs ''cityTrain'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
+'You have easy access to the <a href="exec: minut += 5 & gs ''cityTrain'', ''start''">train station</a> and <<$desc_txt1>> is only a short walk from there. Both connect you quickly to other parts of St Petersburg and the subway is great if you are tight on cash. If you can''t afford either, the <a href="exec:minut += 35 & gt ''city_park'', ''start''">central park</a> is a thirty minute walk from here and provides a more scenic route to the other city districts.'
 *nl
 if hour >= 8 and hour <= 22:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''kiosk'', ''start''">kiosk</a>'

+ 1 - 1
locations/city_industrial.qsrc

@@ -52,7 +52,7 @@ if $ARGS[0] = '':
 
 	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
-	'The towns <a href="exec:minut += 60 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
+	'The towns <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is an hours walk from here.'
 
 	if hour > 7 and hour < 23:
 		'You can see the <a href="exec:$locM = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'

+ 7 - 7
locations/island.qsrc → locations/city_island.qsrc

@@ -1,9 +1,9 @@
-# island
-!!new island main page
+# city_island
+
 $metka = ''
-$loc = 'island'
+$loc = 'city_island'
 $location_type = 'public_outdoors'
-$menu_loc = 'island'
+$menu_loc = 'city_island'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL
@@ -37,7 +37,7 @@ end
 'The University area of the city, the University, shops, clubs and the like that cater to the college kids dominate this area of the city. There is only three bridges onto and off the island, plus the metro line.'
 
 !call random events from [street_events], and display them before show location.
-gs'street_event','island' & if streetrand = -1:exit
+gs'street_event','city_island' & if streetrand = -1:exit
 if student > 0:act '<b>GO HOME</b> (University dorm)':gt 'dorm', 'start'
 
 if car > 0 and cardrive = 25:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
@@ -47,12 +47,12 @@ act 'Wait':gs 'obj_din', 'wait'
 
 gs 'taxi'
 
-if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_island'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:gt ''dolls'', ''start''">Patch Work Dolls</a> is a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like.'
 if hour >= 4 and hour <= 23:'The <a href="exec:minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if week < 6 and hour >= 7:'At the <a href="exec:gt ''univer'', ''start''">University</a> where you can earn your bachelors degree.'
 if student > 0 or (hour >= 6 and hour <= 23):'The <a href="exec:gt ''dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
 
---- island ---------------------------------
+--- city_island ---------------------------------
 

+ 98 - 98
locations/lake.qsrc → locations/city_lake.qsrc

@@ -1,9 +1,9 @@
-# lake
+# city_lake
 
 if $ARGS[0] = 'start':
-	$loc = 'lake'
+	$loc = 'city_lake'
 	$metka = 'start'
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'start'
 	menu_off = 0
 	$location_type = 'public_outdoors'
@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 		if $clothingworntype = 'swimwear':
 			cla
 			'You need to get dressed in regular clothing first.'
-			act'Return':gt 'lake','start'
+			act'Return':gt 'city_lake','start'
 		else
 			minut += 40
 			gt 'city_residential'
@@ -58,8 +58,8 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 20:
-		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
-		'You can go for a ride on a <a href="exec:gt ''lake'', ''horse''">horse</a> along the beach.'
+		'Nearby are various '+iif($clothingworntype = 'swimwear','<a href="exec:gt ''city_lake'', ''aquapark''">water attractions</a>.','water attractions, but you need to put on some swimwear before you go there.')+''
+		'You can go for a ride on a <a href="exec:gt ''city_lake'', ''horse''">horse</a> along the beach.'
 		'And a short walk from here there is even a '+iif(pcs_inhib >= 30 or (exhibitionist_lvl > 1 and pcs_horny > 60),'<a href="exec:gt ''Nudelake''">nudist beach</a>','nudist beach, but you are''t confident enough to go in that direction.')+''
 		if temper >= 15 and $clothingworntype = 'swimwear':
 			'Also you can sunbathe or swim.'
@@ -74,10 +74,10 @@ if $ARGS[0] = 'start':
 				'You walk along the shore.'
 				walkrand = rand(0, 100)
 
-				if walkrand >= 50 and walkrand < 60:gt 'lake', 'walklake1'
-				if walkrand >= 60 and walkrand < 70:gt 'lake', 'walklake2'
+				if walkrand >= 50 and walkrand < 60:gt 'city_lake', 'walklake1'
+				if walkrand >= 60 and walkrand < 70:gt 'city_lake', 'walklake2'
 
-				act 'Finish':gt 'lake', 'start'
+				act 'Finish':gt 'city_lake', 'start'
 			end
 
 			act 'Swim (1:00)':
@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 				'You swim in the lake, the water refreshes and invigorates.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-				act 'Get out of the water':gt 'lake', 'start'
+				act 'Get out of the water':gt 'city_lake', 'start'
 			end
 			if sunWeather = 1:
 				act 'Sunbathe (1:00)':
@@ -124,9 +124,9 @@ if $ARGS[0] = 'start':
 					evrand = rand(0, 100)
 
 					if evrand > 50:
-						act 'Rise from the beach':gt 'lake', 'start'
+						act 'Rise from the beach':gt 'city_lake', 'start'
 					elseif evrand <= 30 and andrei > 0:
-						act 'Rise from the beach':gt 'lake', 'start'
+						act 'Rise from the beach':gt 'city_lake', 'start'
 					elseif evrand <= 30 and andrei = 0:
 						anreirape = 1
 						'You fall asleep on the beach while sunbathing. You dream that someone is caressing your chest. Your nipples harden, your breasts rise from deep breaths. It feels like something wet glides across your breast, and you moan sweetly.'
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 										gs 'stat'
 										'You very accurately knee him in the balls, he screams and lets you down.'
 
-										act 'Escape from the beach':gt 'lake', 'start'
+										act 'Escape from the beach':gt 'city_lake', 'start'
 									end
 								else
 									act 'Knee him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -190,16 +190,16 @@ if $ARGS[0] = 'start':
 											'"<<$pcs_nickname>>" You answer.'
 											'"I see that you liked our game. Want to catch an even bigger thrill? Then come back tomorrow", Says Andrew suavely dressing. "Repeat our deeds."'
 
-											act 'Leave the beach':gt 'lake', 'start'
+											act 'Leave the beach':gt 'city_lake', 'start'
 										end
 									end
 								end
 							end
 						end
 					elseif evrand <= 40 and evrand > 30:
-						gt 'lake', 'vlake1'
+						gt 'city_lake', 'vlake1'
 					elseif evrand <= 50 and evrand > 40:
-						gt 'lake', 'vlake2'
+						gt 'city_lake', 'vlake2'
 					end
 				end
 			end
@@ -208,7 +208,7 @@ if $ARGS[0] = 'start':
 		if anreiday ! daystart and andrei = 2:
 			'You see Andrew on the beach.'
 
-			act 'Approach Andrew':gt 'lake', 'andrey1'
+			act 'Approach Andrew':gt 'city_lake', 'andrey1'
 		end
 	end
 end
@@ -217,21 +217,21 @@ if $ARGS[0] = 'aquapark':
 	cla & *clr
 	$location_type = 'public_outdoors'
 	minut += 5
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'aquapark'
 	menu_off = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/aquapark.jpg"></center>'
 	'You go to the attractions.'
-	'There is <a href="exec:gt ''lake'', ''gidro''">Jet Skiing</a>, a <a href="exec:gt ''lake'', ''banan''">banana ride</a> and the <a href="exec:gt ''Lake'', ''gorka''">water slide</a>.'
+	'There is <a href="exec:gt ''city_lake'', ''gidro''">Jet Skiing</a>, a <a href="exec:gt ''city_lake'', ''banan''">banana ride</a> and the <a href="exec:gt ''city_lake'', ''gorka''">water slide</a>.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'gidro':
 	cla & *clr
 	$location_type = 'event_outdoors'
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'gidro'
 	menu_off = 0
 	minut += 1
@@ -251,19 +251,19 @@ if $ARGS[0] = 'gidro':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/gidro.jpg"></center>'
 			'You take a jet ski, and spend 30 minutes having loads of fun.'
 
-			if rand(0,4) = 0:gt 'lake', 'kater1'
+			if rand(0,4) = 0:gt 'city_lake', 'kater1'
 
-			act 'Finish':gt 'lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'banan':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'banan'
 	menu_off = 0
 	gs 'stat'
@@ -285,22 +285,22 @@ if $ARGS[0] = 'banan':
 			banrand = rand(0, 100)
 
 			if banrand >= 80 and banrand < 90:
-				gt 'lake', 'kater2'
+				gt 'city_lake', 'kater2'
 			elseif banrand >= 90:
-				gt 'lake', 'kater3'
+				gt 'city_lake', 'kater3'
 			end
 
-			act 'Finish':gt 'Lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'gorka':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'gorka'
 	menu_off = 0
 	minut += 1
@@ -321,17 +321,17 @@ if $ARGS[0] = 'gorka':
 			'You climb to the top, then whiz down and around, before splashing into the pool with a massive smile on your face.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
 
-			act 'Finish':gt 'lake', 'aquapark'
+			act 'Finish':gt 'city_lake', 'aquapark'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'aquapark'
+	act 'Move away':gt 'city_lake', 'aquapark'
 end
 
 if $ARGS[0] = 'horse':
 	$location_type = 'event_outdoors'
 	cla & *clr
-	$menu_loc = 'lake'
+	$menu_loc = 'city_lake'
 	$menu_arg = 'horse'
 	menu_off = 0
 	minut += 1
@@ -353,16 +353,16 @@ if $ARGS[0] = 'horse':
 			horserand = rand(0, 100)
 
 			if horserand >= 60 and horserand < 80:
-				gt 'lake', 'horse1'
+				gt 'city_lake', 'horse1'
 			elseif horserand >= 80:
-				gt 'lake', 'horse2'
+				gt 'city_lake', 'horse2'
 			end
 
-			act 'Finish':gt 'lake', 'start'
+			act 'Finish':gt 'city_lake', 'start'
 		end
 	end
 
-	act 'Move away':gt 'lake', 'start'
+	act 'Move away':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'walklake1':
@@ -375,7 +375,7 @@ if $ARGS[0] = 'walklake1':
 	'Walking along the beach you hear someone calling you, "Hey beauty, come here." You turn around and see that next to the shore, between the trees, there is a hut and on the threshold sits a guy.'
 
 	if ribakSex = 0:
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 
 		act 'Approach':
 			cla & *clr
@@ -384,7 +384,7 @@ if $ARGS[0] = 'walklake1':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 			'You approach the guy with a fishing rod. He looks at you from head to toe, lustfully and imposingly.'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 
 			if pcs_apprnc < 60:
 				'The guy smiles and begins to hum, "You look terrible, you really should look after yourself better."'
@@ -408,7 +408,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You rebell at such brazen statements. The guy just grins more widely. "Come on. Do not worry. I love whores." After these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 
 					act 'What? (Wonder)':
@@ -417,7 +417,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You are surprised by such impudence. The guy just grins more widely. "You''ll be even hungrier after seeing this!" With these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 
 					act 'Hmm (thinking)':
@@ -426,7 +426,7 @@ if $ARGS[0] = 'walklake1':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk1/walk1.jpg"></center>'
 						'You think for a second. The guy just grins more widely. "Damn, I knew it, just by looking at you, I have a nose for whores missing out on dick." With these words the man unbuttoned his pants and pulls out a hefty cock, which was clearly no less than 25 centimeters long. "Come on baby, look what papa has for your goddamned mouth." The man beckons you with a finger.'
-						gs 'lake', 'dinribak'
+						gs 'city_lake', 'dinribak'
 					end
 				end
 			end
@@ -434,7 +434,7 @@ if $ARGS[0] = 'walklake1':
 	elseif ribakSex > 0:
 		'You go to the guy, who greets you. Hi <<$ribakName>> want more deliciousness?'
 
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 
 		if $ribakName = 'whore':
 			act 'Two pieces!':
@@ -449,7 +449,7 @@ if $ARGS[0] = 'walklake1':
 					act 'Leave (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'lake', 'start'
+						gt 'city_lake', 'start'
 					end
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'walklake1':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
 							'You are tired and haven''t got the energy to leave. The man takes your hair in his hand and wiped his cock on your hair. After that, he rudely tells you. "Whore to the core! Now get out."'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -531,7 +531,7 @@ if $ARGS[0] = 'walklake1':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/spit.jpg"></center>'
 							'The guy suddenly thrust the fingers of both his hands in your mouth holding your lips apart and with relish spits in your mouth. You flinch from this and feel like your cheeks blush with a flood of shame. The guy looked at you angrily, "You are a lewd, vile creature that got what she deserved. Now get out!"'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'walklake1':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/cum1.jpg"></center>'
 					'You try to dodge, but the guy grabs you by the hair and you get a jet of sperm on your face. Finally drying up and the guy says, "Get out of here bitch!"'
 
-					act 'Leave':gt 'lake', 'start'
+					act 'Leave':gt 'city_lake', 'start'
 				end
 			end
 		end
@@ -567,7 +567,7 @@ if $ARGS[0] = 'dinribak':
 			act 'Leave (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -586,7 +586,7 @@ if $ARGS[0] = 'dinribak':
 				act 'Change your mind and leave (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'lake', 'start'
+					gt 'city_lake', 'start'
 				end
 			else
 				act 'Change your mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -624,7 +624,7 @@ if $ARGS[0] = 'dinribak':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/facefuck1.jpg"></center>'
 						'You are tired and haven''t got the energy to leave. The man takes your hair in his hand and wiped his cock on your hair. After that, he rudely tells you. "Whore to the core! Now get out."'
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -643,7 +643,7 @@ if $ARGS[0] = 'dinribak':
 			act 'Faint compliance then run (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', 'start'
 			end
 		else
 			act 'Faint compliance then run (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -691,7 +691,7 @@ if $ARGS[0] = 'dinribak':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/spit.jpg"></center>'
 						'The guy suddenly thrust the fingers of both his hands in your mouth holding your lips apart and with relish spits in your mouth. You flinch from this and feel like your cheeks blush with a flood of shame. The guy looked at you angrily, "You are a lewd, vile creature that got what she deserved. Now get out!"'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -706,7 +706,7 @@ if $ARGS[0] = 'dinribak':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/whore/cum1.jpg"></center>'
 				'You try to dodge, but the guy grabs you by the hair and you get a jet of sperm on your face. Finally drying up and the guy says, "Get out of here bitch!"'
 
-				act 'Leave':gt 'lake', 'start'
+				act 'Leave':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -725,7 +725,7 @@ if $ARGS[0] = 'walklake2':
 		'You get hot and deciding to freshen up a bit, you walk out into the water, turning you notice not far behind you, Stasik and Valera looking at you.'
 	end
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 
 	if StasikValera = 0:
 		act 'Look at them':
@@ -735,16 +735,16 @@ if $ARGS[0] = 'walklake2':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/stasValera.jpg"></center>'
 			'You look at the men and notice that they are whispering to each other. Then one of the men comes up to you. He says smiling, "Hey beautiful, I am Stasik, and this is my friend Valera. What''s your name?"'
-			act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
+			act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
 
 			act 'I have to go':
 				cla & *clr
 				minut += 1
 				gs 'stat'
 				'You''re not going to get acquainted with these fellows and began to leave. Stasik tries to persuade you. "Come on, babe. Do we look like savages? We just wanted to talk, but I understand if you''re frightened. I just wanted to ask you your name."'
-				act '<<$pcs_nickname>>': gt 'lake', 'stasValera'
+				act '<<$pcs_nickname>>': gt 'city_lake', 'stasValera'
 
-				act 'Leave':gt 'lake', 'start'
+				act 'Leave':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -800,7 +800,7 @@ if $ARGS[0] = 'walklake2':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/walk2/walk7.jpg"></center>'
 								'Sated the men lower you down, and begin to masturbate on your face, you open your mouth and wait patiently. They both finish, pouring a gulf of sperm in your mouth and on your face.'
 
-								act 'Leave':gt 'lake', 'start'
+								act 'Leave':gt 'city_lake', 'start'
 							end
 						end
 					end
@@ -823,8 +823,8 @@ if $ARGS[0] = 'stasValera':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/talk6.jpg"></center>'
 		'You stand aroundtalking to the men. Stasik begins to tell you that he works with Valera as sales representatives of a major company, and boasts about their seniority and importance. Throughout the conversation, both men are making lewd gestures and Stasik moves his hand to your chest.'
-		act 'Remove Stasik''s hands from you': gt 'lake', 'stasValera2a'
-		act 'Smile and pretend nothing is happening': gt 'lake', 'stasValera2b'
+		act 'Remove Stasik''s hands from you': gt 'city_lake', 'stasValera2a'
+		act 'Smile and pretend nothing is happening': gt 'city_lake', 'stasValera2b'
 	end
 end
 
@@ -845,7 +845,7 @@ if $ARGS[0] = 'stasValera2a':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse3.jpg"></center>'
 			'You angrily stand up and began to leave. Stasik gets to his feet and tries to persuade you to go with the guys to the cafe.'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 		end
 	else
 		act 'Rebel and go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -858,7 +858,7 @@ if $ARGS[0] = 'stasValera2a':
 		gs 'arousal', 'foreplay', 5
 		minut -= 3
 		gs 'stat'
-		act 'Further': gt 'lake', 'stasValera3'
+		act 'Further': gt 'city_lake', 'stasValera3'
 	end
 end
 
@@ -869,7 +869,7 @@ if $ARGS[0] = 'stasValera2b':
 	gs 'arousal', 'foreplay', 5
 	minut -= 3
 	gs 'stat'
-	act 'Further': gt 'lake', 'stasValera3'
+	act 'Further': gt 'city_lake', 'stasValera3'
 end
 
 if $ARGS[0] = 'stasValera3':
@@ -890,7 +890,7 @@ if $ARGS[0] = 'stasValera3':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse4.jpg"></center>'
 			'You jump to your feet adjusting your bra. Stasik smiles, "Do not be afraid girl."'
 
-			act 'Leave':gt 'lake', 'start'
+			act 'Leave':gt 'city_lake', 'start'
 		end
 	else
 		act 'Hey! What are you doing? (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'stasValera3':
 			gs 'arousal', 'foreplay', 5
 			minut -= 3
 			gs 'stat'
-			act 'Relax': gt 'lake', 'stasValera4'
+			act 'Relax': gt 'city_lake', 'stasValera4'
 		end
 	else
 		act 'Feebly protest (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -920,7 +920,7 @@ if $ARGS[0] = 'stasValera3':
 		gs 'arousal', 'foreplay', 5
 		minut -= 3
 		gs 'stat'
-		act 'Relax': gt 'lake', 'stasValera4'
+		act 'Relax': gt 'city_lake', 'stasValera4'
 	end
 end
 
@@ -971,7 +971,7 @@ if $ARGS[0] = 'stasValera4':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/stas/refuse2.jpg"></center>'
 						'You refuse and Stasik shrugs, "Well, as you wish."'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 
 					act 'Agree':
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'vlake1':
 		act 'Leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'vlake1':
 			act 'Leave (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'vlake1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake4.jpg"></center>'
 				'One of the guys leans toward your pussy, kisses it and begins to lick it, trying to shove his fingers inside.'
 
-				act 'Remove his fingers':gt 'lake', 'vlake1cum'
+				act 'Remove his fingers':gt 'city_lake', 'vlake1cum'
 
 				act 'Relax and enjoy':
 					*clr & cla
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'vlake1':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake8.jpg"></center>'
 						'"There''s space for two" you say, and don''t even have time to finish before a dick is in your ass. The guys often spin you around, trying all kinds of different positions, but always with all your holes plugged by their members, it''s crazy but you do not want it to finish, however, eventually it seems that it will.'
 
-						act 'Finish':gt 'lake', 'vlake1cum'
+						act 'Finish':gt 'city_lake', 'vlake1cum'
 					end
 				end
 			end
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'vlake1cum':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake5.jpg"></center>'
 	'Boys begin to cum on your face and mouth. You lick the cum off their dicks and swallow it. Finally satisfied the guys, dress and go, you''re left unsatisfied.'
 
-	act 'Leave': gs 'arousal', 'end' & gt 'lake', 'start'
+	act 'Leave': gs 'arousal', 'end' & gt 'city_lake', 'start'
 
 	act 'Masturbate':
 		*clr & cla
@@ -1115,7 +1115,7 @@ if $ARGS[0] = 'vlake1cum':
 		$orgasm_or = 'yes'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 	end
 end
 
@@ -1130,7 +1130,7 @@ if $ARGS[0] = 'vlake2':
 		act 'Disregard (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Disregard (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'vlake2':
 			act 'And push them away (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'lake', 'start'
+				gt 'city_lake', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'vlake2':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake6.jpg"></center>'
 						'Changing position, you plant your anus on the man lying down. The second man comes up to you and holding your head with one hand begin to fuck your mouth, penetrating his cock deeper and deeper. After a while you feel hot cum fill your anus and finished with him, the second man gets ready to cum in your mouth.'
 
-						act 'Continue to suck':gt 'lake', 'vlake2cum'
+						act 'Continue to suck':gt 'city_lake', 'vlake2cum'
 
 						act 'Pull':
 							*clr & cla
@@ -1201,7 +1201,7 @@ if $ARGS[0] = 'vlake2':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake7.jpg"></center>'
 							'You remove the member from your mouth and the man finishes all over your face.'
 
-							act 'Leave':gt 'lake', 'start'
+							act 'Leave':gt 'city_lake', 'start'
 						end
 					end
 				end
@@ -1218,7 +1218,7 @@ if $ARGS[0] = 'vlake2cum':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake2/vlake8.jpg"></center>'
 	'You continued to suck and soon your mouth is filled with streams of semen, you swallow it and carefully lick his cock, leaving not even a drop of sperm.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'andrey1':
@@ -1232,7 +1232,7 @@ if $ARGS[0] = 'andrey1':
 		act 'Refuse (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		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>'
@@ -1279,7 +1279,7 @@ if $ARGS[0] = 'andrey1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey3.jpg"></center>'
 				'The shy young man comes up to you. "Well, what are you waiting for, briefs off and get against the girl." Andrew shouts at him, turning you over and pulling apart your buttocks with his hands. The young man comes from behind and puts his penis in your anus. Now two members move in you as pistons delivering incredible pleasure. Moaning you ride on the two cocks, until the young man finishes on your ass, and Andrew gets up and cums in your mouth.'
 
-				act 'Rise from the beach':gt 'lake', 'start'
+				act 'Rise from the beach':gt 'city_lake', 'start'
 			end
 
 			act 'Deeper! Stronger!':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'andrey1':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/andrey1/andrey4.jpg"></center>'
 				'"Deeper, Stronger!" You shout, you do not hesitate to enthusiastically absorb the whole man. He answers you with an inarticulate growl escaping to the beat of his ragged breathing. Even before the two of you finish off, the boy has run away.'
 
-				act 'Rise from the beach':gt 'lake', 'start'
+				act 'Rise from the beach':gt 'city_lake', 'start'
 			end
 		end
 	end
@@ -1311,7 +1311,7 @@ if $ARGS[0] = 'kater1':
 		act 'Take the Jet ski and leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Take the Jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1332,7 +1332,7 @@ if $ARGS[0] = 'kater1':
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater3.jpg"></center>'
 			'You sit the guy down and lick his cock, then open your lips and start sucking selflessly, in a few minutes you feel like the dick in your mouth is ready to finish.'
 
-			act 'Continue to suck':gt 'lake', 'kater1cum'
+			act 'Continue to suck':gt 'city_lake', 'kater1cum'
 
 			act 'Stay':
 				*clr & cla
@@ -1364,7 +1364,7 @@ if $ARGS[0] = 'kater1':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater8.jpg"></center>'
 								'Then he stands up, lifting you with him, he rises one of your legs and forcefully inserts his penis into your vagina, you are satisfied and tired but hang on waiting for him to finish. After a few thrusts he pulls out his dick and lets you fall to your knees and the guy puts his dick to your mouth.'
 
-								act 'Suck':gt 'lake', 'kater1cum'
+								act 'Suck':gt 'city_lake', 'kater1cum'
 							end
 						end
 					end
@@ -1392,7 +1392,7 @@ if $ARGS[0] = 'kater1cum':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater1/kater10.jpg"></center>'
 		'When the stream dries up, you are covered in sperm and begin to lick the remnants off his cock, savoring every drop.'
 
-		act 'Leave':gt 'lake', 'start'
+		act 'Leave':gt 'city_lake', 'start'
 	end
 end
 
@@ -1412,7 +1412,7 @@ if $ARGS[0] = 'kater2':
 		act 'Pretend to be asleep until docked (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Pretend to be asleep until docked (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1475,7 +1475,7 @@ if $ARGS[0] = 'kater2':
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater2/kater8.jpg"></center>'
 								'Soon the second one groans, you turn to him, but even though you opened your mouth, the guy completely covers your face.'
 
-								act 'Leave':gt 'lake', 'start'
+								act 'Leave':gt 'city_lake', 'start'
 							end
 						end
 					end
@@ -1502,7 +1502,7 @@ if $ARGS[0] = 'kater3':
 		act 'Take the Jet ski and leave (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		end
 	else
 		act 'Take the Jet ski and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1552,7 +1552,7 @@ if $ARGS[0] = 'kater3':
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/kater3/11.jpg"></center>'
 						'Sated they kneel you down and end in your mouth.'
 
-						act 'Leave':gt 'lake', 'start'
+						act 'Leave':gt 'city_lake', 'start'
 					end
 				end
 			end
@@ -1572,7 +1572,7 @@ if $ARGS[0] = 'horse1':
 
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Refuse (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'lake', 'start'
+		act 'Refuse (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_lake', 'start'
 	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>'
 	end
@@ -1592,7 +1592,7 @@ if $ARGS[0] = 'horse1':
 
 			gs 'willpower', 'group', 'resist'
 			if will_cost <= pcs_willpwr:
-				act 'Push them away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'lake', 'start'
+				act 'Push them away (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_lake', 'start'
 			else
 				act 'Push them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1648,7 +1648,7 @@ if $ARGS[0] = 'horse1':
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse9.jpg"></center>'
 									'You kneel before the second man and lick him from his balls to the head and take him in your mouth, as you suck his dick with pleasure the man trembles. "I''m going to finish."'
 
-									act 'Continue to suck':gt 'lake', 'horse1bj'
+									act 'Continue to suck':gt 'city_lake', 'horse1bj'
 
 									act 'Pull':
 										*clr & cla
@@ -1658,7 +1658,7 @@ if $ARGS[0] = 'horse1':
 										'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse10.jpg"></center>'
 										'You remove his member from your mouth and the man had finishes on your face, with the words, "Here''s a babys face cream." You gladly licked the remnants of sperm from his penis.'
 
-										act 'Leave':gt 'lake', 'start'
+										act 'Leave':gt 'city_lake', 'start'
 									end
 								end
 							end
@@ -1678,7 +1678,7 @@ if $ARGS[0] = 'horse1bj':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse1/horse11.jpg"></center>'
 	'The flow of sperm gushes into your mouth, you swallow it purring with pleasure, lick the remnants of his cock and swallow again.'
 
-	act 'Leave':gt 'lake', 'start'
+	act 'Leave':gt 'city_lake', 'start'
 end
 
 if $ARGS[0] = 'horse2':
@@ -1694,7 +1694,7 @@ if $ARGS[0] = 'horse2':
 		act 'Refuse (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'lake', 'start'
+			gt 'city_lake', 'start'
 		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>'
@@ -1705,7 +1705,7 @@ if $ARGS[0] = 'horse2':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse2.jpg"></center>'
 		'You get down from your horses and start walking along the beach talking about any old nonsense.'
 
-		act 'Finish the walk':gt 'lake', 'start'
+		act 'Finish the walk':gt 'city_lake', 'start'
 
 		act 'Touch their pants':
 			*clr & cla
@@ -1764,7 +1764,7 @@ if $ARGS[0] = 'horse2':
 									'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/horse2/horse9.jpg"></center>'
 									'You remove the cock from your mouth and open wide, ready to catch the stream of sperm, the man does not keep you waiting and sperm splatters into your mouth, painting your tongue and throat.'
 
-									act 'Leave':gt 'lake', 'start'
+									act 'Leave':gt 'city_lake', 'start'
 								end
 							end
 						end
@@ -1775,5 +1775,5 @@ if $ARGS[0] = 'horse2':
 	end
 end
 
---- lake ---------------------------------
+--- city_lake ---------------------------------
 

+ 43 - 42
locations/park.qsrc → locations/city_park.qsrc

@@ -1,14 +1,15 @@
-# park
+# city_park
+
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
 
 	$metka = 'start'
-	$loc = 'park'
-	$menu_loc = 'park'
+	$loc = 'city_park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'start'
-	$locclass = 'park'
+	$locclass = 'city_park'
 	menu_off = 0
 	if sound = 0:
 		if month >=11 and month <= 12 or month >=1 and month <=3:
@@ -20,7 +21,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	$sexloc = 'park'
+	$sexloc = 'city_park'
 
 	if WalkInsidePark = 0:WalkInsidePark = 1
 	*clr & cla
@@ -36,10 +37,10 @@ if $ARGS[0] = 'start':
 	*nl
 	if hour >= 10 and hour <= 22:'The small café in the park is open, you could sit there and have some food.'
 
-	if SNarkPriton = 0:'Near the cafe the <a href="exec: gt ''park'', ''junkies''">junkies</a> hang out.'
+	if SNarkPriton = 0:'Near the cafe the <a href="exec: gt ''city_park'', ''junkies''">junkies</a> hang out.'
 
 	if hour >= 9 or hour <= 20:
-		'There is an all year <a href="exec:gt ''park'', ''luna''">fair</a> at the park which you can visit.'
+		'There is an all year <a href="exec:gt ''city_park'', ''luna''">fair</a> at the park which you can visit.'
 	else
 		'There is an all year fair at the park but it is closed. Opening hours from 9:00 to 21:00.'
 	end
@@ -66,7 +67,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': gt 'park', 'exit'
+	act 'Leave': gt 'city_park', 'exit'
 
 	act 'Walk around the park (1:00)': gt 'parkdin'
 
@@ -108,7 +109,7 @@ if $ARGS[0] = 'start':
 					'You get out your purse and pay him quickly, hoping nobody else saw you giving him money. Then he passes you the doses you''ve paid for and you can savely sniff the stuff at home.'
 				end
 
-				act 'Casually walk away':gt 'park', 'start'
+				act 'Casually walk away':gt 'city_park', 'start'
 			end
 		else
 			'You do not have enough money, not even for one dose.'
@@ -158,7 +159,7 @@ if $ARGS[0] = 'start':
 			act 'Finish your run':
 				cla & *nl
 				'You feel great after your run. A bit sweaty, but also that you''ve managed to improve your stamina as you even feel a bit slimmer.'
-				act 'Continue': gt 'park', 'start'
+				act 'Continue': gt 'city_park', 'start'
 			end
 			
 			if pcs_inhib >= 35  or exhibitionist_lvl > 0:
@@ -189,7 +190,7 @@ if $ARGS[0] = 'start':
 					pcs_mood -= 5
 					*nl
 					'No luck! After searching for half an hour, you find no one. For such a large city you would have thought there would be suitable prey around, your needs remain so maybe another search will be required?'
-					act 'Continue': gt 'park', 'start'
+					act 'Continue': gt 'city_park', 'start'
 				else
 					suchunt = 1 & gt 'parkivent', '1'
 				end
@@ -212,7 +213,7 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'park', 'start'
+			act 'Continue': gt 'city_park', 'start'
 		end
 	end
 
@@ -225,23 +226,23 @@ if $ARGS[0] = 'start':
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
-			act 'Continue': gt 'park', 'start'
+			act 'Continue': gt 'city_park', 'start'
 		end
 	end
 end
 
 if $ARGS[0] = 'exit':
 	cla
-	$loc = 'park'
+	$loc = 'city_park'
 	$metka = 'exit'
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'exit'
 	menu_off = 0
 	'<center><b><font color="maroon">Park</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/park.jpg"></center>'
-	act 'Don''t leave': gt 'park', 'start'
+	act 'Don''t leave': gt 'city_park', 'start'
 	!!this leads to the old street walker content, blocked until it''s fixed up or moved into the new street walker content (julzor)
-	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'park', 'whore'
+	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'city_park', 'whore'
 	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'city_residential'
 	act 'Go to the City Center (0:35)':minut += 35 & gt 'city_center'
 	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
@@ -249,7 +250,7 @@ end
 
 if $ARGS[0] = 'luna':
 	*clr & cla
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'luna'
 	menu_off = 0
 	minut += 5
@@ -263,7 +264,7 @@ if $ARGS[0] = 'luna':
 
 	if vladimirQW = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''qwloc''">There''s a strong looking man staring at you from the fences.</a>.'
 
-	act 'Go back to the park':gt 'park', 'start'
+	act 'Go back to the park':gt 'city_park', 'start'
 	
 	if hour >= 9 and hour <= 20:
 		act 'Distribute flyers to earn money (50 <b>₽</b>) (1:00)':
@@ -275,7 +276,7 @@ if $ARGS[0] = 'luna':
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/flaer.jpg"></center>'
 			'For an hour straight, you walked through the park and the fun fair, chatting up random visitors and trying to give them one of your flyers. After that you are being paid 50 <b>₽</b> for your effort.'
 
-			act 'Move away':gt 'park', 'luna'
+			act 'Move away':gt 'city_park', 'luna'
 		end
 
 		if money >= 50:
@@ -294,7 +295,7 @@ if $ARGS[0] = 'luna':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/luna1.jpg"></center>'
 				'You enjoy the shawarma.'
 
-				act 'Move away':gt 'park', 'luna'
+				act 'Move away':gt 'city_park', 'luna'
 			end
 
 			act 'Drink Lemonade (50 <b>₽</b>)':
@@ -312,7 +313,7 @@ if $ARGS[0] = 'luna':
 				'<center><img <<$set_imgh>> src="images/locations/city/centralpark/luna1.jpg"></center>'
 				'You happily drink the refreshing lemonade.'
 
-				act 'Move away':gt 'park', 'luna'
+				act 'Move away':gt 'city_park', 'luna'
 			end
 
 			act 'Ride on the carousel (50 <b>₽</b>)':
@@ -328,7 +329,7 @@ if $ARGS[0] = 'luna':
 				'You paid 50 <b>₽</b> and sat in the carousel.'
 				'You have a great ride, already dazzled.'
 
-				act 'Move away':gt 'park','luna'
+				act 'Move away':gt 'city_park','luna'
 			end
 		end
 
@@ -375,7 +376,7 @@ if $ARGS[0] = 'luna':
 
 					shoot_lvl += 1
 
-					act 'Move away':gt 'park', 'luna'
+					act 'Move away':gt 'city_park', 'luna'
 				end
 			end
 		end
@@ -403,12 +404,12 @@ if $ARGS[0] = 'luna':
 						'You swung the hammer as hard as you could, but it wasn''t enough for a new record.'
 					end
 
-					act 'Move away':gt 'park', 'luna'
+					act 'Move away':gt 'city_park', 'luna'
 				end
 			end
 		end
 
-		act 'One-Armed Bandit':gt 'park', 'avtomat'
+		act 'One-Armed Bandit':gt 'city_park', 'avtomat'
 	else
 		'The fair is now closed.'
 	end
@@ -423,10 +424,10 @@ if $ARGS[0] = 'avtomat':
 	'The rules of the game are very simple, throw 5 <b>₽</b> into the slot, pull the lever and with a bit of luck you can win the jackpot of 1.000 <b>₽</b>.'
 
 	if money >= 5 and hour <= 20:
-		act 'Throw in 5 <b>₽</b> and pull the lever':gt 'park', 'avtomat2'
+		act 'Throw in 5 <b>₽</b> and pull the lever':gt 'city_park', 'avtomat2'
 	end
 
-	act 'Move away from the slot machine':gt 'park', 'luna'
+	act 'Move away from the slot machine':gt 'city_park', 'luna'
 end
 
 if $ARGS[0] = 'avtomat2':
@@ -454,13 +455,13 @@ if $ARGS[0] = 'avtomat2':
 		'Unfortunately, you weren''t able to win anything this time.'
 	end
 
-	act 'Try your luck once more':gt 'park', 'avtomat'
+	act 'Try your luck once more':gt 'city_park', 'avtomat'
 end
 
 if $ARGS[0] = 'whore':
     $location_type = 'event_outdoors'
 	*clr & cla
-	$menu_loc = 'park'
+	$menu_loc = 'city_park'
 	$menu_arg = 'whore'
 	menu_off = 0
 	gs 'stat'
@@ -479,7 +480,7 @@ if $ARGS[0] = 'whore':
 
 	temp = rand(1, 10)
 
-	act 'Go back to the park (0:05)': minut += 5 & gt 'park', 'start'
+	act 'Go back to the park (0:05)': minut += 5 & gt 'city_park', 'start'
 	
 	if pcs_inhib > 35:
 		act 'Flash breasts':
@@ -488,7 +489,7 @@ if $ARGS[0] = 'whore':
 			inhib_exp += 2
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
-			act 'Go back to the park':gt 'park', 'start'
+			act 'Go back to the park':gt 'city_park', 'start'
 		end
 	end
 end
@@ -510,7 +511,7 @@ if $ARGS[0] = 'prost':
 			whoreQW = 2
 			'You went to a prostitute and asked her how things are done here at all. She began to explain. "We are free, do not work on anyone, but because of this many problems. Svimi Stella with her friends sometimes beat us and rob and sometimes come petty thugs and rob us of the money. If you want to work here, you have to pay and Stella and Bandyuk . course you cool, you can try to besiege Stella and her friends, but the bandits do not advise contact. And yet, you do not peck on customers, if you nebudesh dressed like a slut, you can buy some clothes in a sex shop. "'
 
-			act 'Move away':gt 'park', 'prost'
+			act 'Move away':gt 'city_park', 'prost'
 		end
 	elseif whoreQW = 0:
 		'Hey, you''re not one of us, would valyl from our point, and that the teeth will not collect.'
@@ -542,7 +543,7 @@ if $ARGS[0] = 'prost':
 						money -= 1000
 						'You gave the money big man in the jeep. He put them in his pocket and left.'
 
-						act 'Move away':gt 'park', 'prost'
+						act 'Move away':gt 'city_park', 'prost'
 					end
 				end
 
@@ -584,12 +585,12 @@ if $ARGS[0] = 'prost':
 
 				'After the client has finished you off immediately dropped out of the car.'
 
-				act 'Go to the panel':gt 'park', 'prost'
+				act 'Go to the panel':gt 'city_park', 'prost'
 			elseif whrand > 60 and whrand <= 90:
 				minut += 15
 				'You were walking along the sidewalk showing off their charms completely in vain, no you are not interested.'
 
-				act 'Go to the panel':gt 'park', 'prost'
+				act 'Go to the panel':gt 'city_park', 'prost'
 			elseif whrand > 90:
 				'To you approached a prostitute. "I hear you, slut, if you do not want problems, you have to pay Stella. Pyatihatnik Come here and get out on work."'
 
@@ -599,7 +600,7 @@ if $ARGS[0] = 'prost':
 						money -= 500
 						'You gave the money to the prostitute, she turned and walked away.'
 
-						act 'Move away':gt 'park', 'prost'
+						act 'Move away':gt 'city_park', 'prost'
 					end
 				end
 
@@ -618,7 +619,7 @@ if $ARGS[0] = 'prost':
 		end
 	end
 
-	act 'Move away':gt 'park', 'start'
+	act 'Move away':gt 'city_park', 'start'
 end
 
 if $ARGS[0] = 'rape1':
@@ -642,7 +643,7 @@ if $ARGS[0] = 'rape1':
 		gs 'arousal', 15, 'vaginal', 'rape', 'rough'
 		gs 'arousal', 'end'
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 	end
 
 	act 'Try to relax and enjoy it':
@@ -668,7 +669,7 @@ if $ARGS[0] = 'rape1':
 			'It doesn''t take long for him to groan out in pleasure, "You better swallow it all, slut!" Shortly after that you can taste his hot cum inside your mouth and you swallow every drip of it, somehow enjoying the taste. Then he stand up, buttons up his pants and takes your money. While you were still liking your fingers clean from any drips of cum, he smiles and says to you, "Have a nice day slut."'
 			gs 'arousal', 'end'
 
-			act 'Stand up and leave':gt 'park', 'start'
+			act 'Stand up and leave':gt 'city_park', 'start'
 		end
 	end
 end
@@ -679,9 +680,9 @@ if $ARGS[0] = 'junkies':
 	SNarkPriton = 1
 	'The junkies look at you with a daunted gaze. They probably thought you are a police officer. Then one of them said, "We don''t sell no drugs. Go to the Drug House, ye can get zome there."'
 
-	act 'Walk away from them':gt 'park', 'start'
+	act 'Walk away from them':gt 'city_park', 'start'
 end
 
 
---- park ---------------------------------
+--- city_park ---------------------------------
 

+ 2 - 2
locations/city_residential.qsrc

@@ -124,8 +124,8 @@ if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely
 if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
 if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''clener'', ''start''">cleaning lady</a> is needed.'
 
-'The city''s large <a href="exec:minut += 20 & gt ''park'', ''start''">central park</a> is about a 20-minute walk away.'
-'The city''s only <a href="exec:minut += 40 & gt ''lake'', ''start''">lake</a> is just a 40-minute walk away.'
+'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is about a 20-minute walk away.'
+'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is just a 40-minute walk away.'
 '24 Hour <a href="exec:$loc = ''city_residential'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
 
 if Enable_tablemap = 0:

+ 1 - 1
locations/dolls.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 
 		act 'Go to the counter': gt 'dolls', 'viola'
 	end
-	act 'Leave': minut += 2 & gt 'island'
+	act 'Leave': minut += 2 & gt 'city_island'
 end
 
 if $ARGS[0] = 'clothing':

+ 3 - 3
locations/dorm.qsrc

@@ -15,13 +15,13 @@ if $ARGS[0] = 'start':
 		*clr & cla
 		minut += 5
 		reccoldorm = 0
-		gt 'island'
+		gt 'city_island'
 	end
 	
 	if student = 0:
 		menu_off = 1
 		'Since you''re not attending the University, you''re not allowed to enter unless you''re visiting someone you know.'
-		act 'Leave': minut += 5 & gt 'island'
+		act 'Leave': minut += 5 & gt 'city_island'
 		if meet_djibril = 1 and hour < 22 and hour >= 7:
 			act 'I''m here to visit Djibril':
 				*clr & cla
@@ -71,7 +71,7 @@ if $ARGS[0] = 'korr':
 		*clr & cla
 		minut += 5
 		reccoldorm = 0
-		gt 'island'
+		gt 'city_island'
 	end
 	act 'Go to the shared bathroom':
 		minut += 5

+ 3 - 3
locations/dormev1.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'djibrilgb':
 			else
 				'You thought you were in the mood for another gangbang, but now that you are here again, you are having second thoughts. You check your phone and tell them you have to go. They try and talk you into staying, but you tell them maybe some other time and make your way out of the door.'
 			end
-			act 'Leave': minut += 5 & gt 'island'
+			act 'Leave': minut += 5 & gt 'city_island'
 		end
 	else
 		act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -64,7 +64,7 @@ if $ARGS[0] = 'djibrilgb':
 					else
 						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this right now - maybe some other time." You say and then hurriedly head for the door. You hear Djibril say "Come on, you can''t leave us like this!" You mutter another "Sorry." You can hear the rest grumbling, but none of them try and stop you as you leave.'
 					end	
-					act 'Leave': minut += 5 & gt 'island'
+					act 'Leave': minut += 5 & gt 'city_island'
 				end
 			else
 				act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -259,7 +259,7 @@ if $ARGS[0] = 'gangbang_dress':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/gangbang_leave.jpg"></center>'
 			'With your face all cleaned up of their cum, you take a final look around to make sure you didn''t leave anything behind and you think about what just happened in here. You can''t help but smile at it, then you head out the door. You make your way out of the dorms, and across the quad back to street.'
 		end	
-		act 'Leave': minut += 5 & gt 'island'
+		act 'Leave': minut += 5 & gt 'city_island'
 	end
 end
 

+ 1 - 1
locations/dort.qsrc

@@ -17,7 +17,7 @@ gs'stat'
 !'<a href="exec:gt ''nowostreet'',''start''">Buildings</a> '
 
 act 'Head to the station':gt 'nordtrain', 'inside'
-act 'Walk to the lake':gt 'lake', 'start'
+act 'Walk to the lake':gt 'city_lake', 'start'
 
 --- dort ---------------------------------
 

+ 9 - 9
locations/ender.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'loss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
 		'You fall to the ground. The prostitute kicks you around a couple of times. She grabs hold of your purse and takes all your money. As she''s done she leans over you and spits in your face.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -65,7 +65,7 @@ if $ARGS[0] = 'loss':
 		'You fall to the ground. As you''re laying down the pimp lites a cigarette while rummaging through your stuff. He finally finds what he''s been looking for, all of your money, then orders, "Open your mouth slut".'
 		'You obey and open your mouth. He sighs as taps ash into your mouth, "I hope you''ve learned a valuable lesson slut, next time I won''t be this kind to you."'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -85,7 +85,7 @@ if $ARGS[0] = 'loss':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -294,7 +294,7 @@ if $ARGS[0] = 'win':
 		'<center><img src="images/locations/city/shared/streetwalker/defeat.jpg"></center>'
 		'The prostitute falls to the ground and starts pleading with you not to beat her again.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		fightEnding = 0
@@ -305,7 +305,7 @@ if $ARGS[0] = 'win':
 
 		'The pimp fell to the ground letting out a groan, You took his wallet and kicked him around before moving away.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		fightEnding = 0
@@ -316,7 +316,7 @@ if $ARGS[0] = 'win':
 
 		'Tattered prostitute fell to the ground, you crash it again in the ribs and it took all his money and gave it to you, Only you did not beat her anymore.'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		KisameDead = 1
@@ -483,7 +483,7 @@ if $ARGS[0] = 'surrender':
 		end
 
 		if pcs_health < 100: pcs_health = 100
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 5:
 		if pcs_health < 100: pcs_health = 100
@@ -497,7 +497,7 @@ if $ARGS[0] = 'surrender':
 		'The pimp lites a cigarette while rummaging through your stuff. He finally finds what he''s been looking for, all of your money, then orders, "Open your mouth slut".'
 		'You obey and open your mouth. He sighs as taps ash into your mouth, "I hope you''ve learned a valuable lesson slut, next time I won''t be this kind to you."'
 
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 6:
 		killvar 'autocombat_surrender'
@@ -524,7 +524,7 @@ if $ARGS[0] = 'surrender':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Further':gt'park','start'
+		act 'Further':gt'city_park','start'
 		exit
 	elseif fightEnding = 7:
 		if pcs_health < 100: pcs_health = 100

+ 7 - 7
locations/event.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'klof 2':
 	'- "Okay, guys give her our address."'
 
 	act 'Get dressed':gt 'event', 'klof 3'
-	!!act 'Move away':gt 'park', 'start'
+	!!act 'Move away':gt 'city_park', 'start'
 end
 
 if $ARGS[0] = 'klof 3':
@@ -25,10 +25,10 @@ if $ARGS[0] = 'klof 3':
 	'- "Of course, Come around tomorrow after 10 hours and we''ll talk", the guy says with a smirk.'
 	'(It turns out, they live in the house next door to you)'
 
-	act 'Leave':gt 'park', 'start'
+	act 'Leave':gt 'city_park', 'start'
 end
 
-if $ARGS[0] = 'park':
+if $ARGS[0] = 'city_park':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/centralpark/sex/event/benchkiss.jpg"></center>'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'hand':
 	gs 'arousal', 'hj', 5, 'dom'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Finish walk':gt 'park', 'start'
+	act 'Finish walk':gt 'city_park', 'start'
 end
 
 if $ARGS[0] = 'blow':
@@ -72,7 +72,7 @@ if $ARGS[0] = 'blow':
 			cla
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'park', 'start'
+			gt 'city_park', 'start'
 		end
 	end
 
@@ -107,7 +107,7 @@ if $ARGS[0] = 'blow':
 			cla
 			gs 'arousal', 'end'
 			gs 'stat'
-			gt 'park', 'start'
+			gt 'city_park', 'start'
 		end
 	end
 end
@@ -124,7 +124,7 @@ if $ARGS[0] = 'sex':
 	gs 'arousal', 'vaginal', 15, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Complete walk':gt 'park', 'start'
+	act 'Complete walk':gt 'city_park', 'start'
 end
 
 if $ARGS[0] = 'dima':

+ 2 - 2
locations/events.qsrc

@@ -329,7 +329,7 @@ if $ARGS[0] = 'snkayf1':
 	gs 'underwear', 'remove'
 	if snkz = 1:
 		minut += 120
-		gt'park','start'
+		gt'city_park','start'
 	end
 
 	if snkz = 2:
@@ -354,7 +354,7 @@ if $ARGS[0] = 'snkayf1':
 
 	if snkz = 6:
 		minut += 120
-		gt'lake','start'
+		gt'city_lake','start'
 	end
 end
 

+ 1 - 1
locations/gskver.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	$location_type = 'public_outdoors'
 	$menu_loc = 'gskver'
 	$menu_arg = 'start'
-	$locclass = 'park'
+	$locclass = 'city_park'
 	menu_off = 0
 	gs 'stat'
 

+ 1 - 1
locations/katja_sex.qsrc

@@ -2,7 +2,7 @@
 
 !new from 1.2.3 fix2
 !from 1.2.3 [Katja_Parc_EV]
-if $ARGS[0] = 'park':
+if $ARGS[0] = 'city_park':
 	if month=3 or month=4 or month=5:
 		if hour>=6 and hour<=17:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'

+ 1 - 1
locations/lug.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'start':
 	$location_type = 'public_outdoors'
 	$menu_loc = 'lug'
 	$menu_arg = 'start'
-	$locclass = 'park'
+	$locclass = 'city_park'
 	menu_off = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/park/lug.jpg" ></center>'

+ 3 - 3
locations/metro.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 	elseif $loc = 'psiklin':
 		'<center><b><font color="maroon">City Suburbs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platsuburb.jpg"></center>'
-	elseif $loc = 'island': 
+	elseif $loc = 'city_island': 
 		'<center><b><font color="maroon">Vasilievsky Island</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platisland.jpg"></center>'
 	end
@@ -81,9 +81,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if $loc ! 'island':
+		if $loc ! 'city_island':
 			act 'Go to the <b>Vasilievsky Island</b> (16 <b>₽</b>)':
-				$loc = 'island'
+				$loc = 'city_island'
 				$metka = ''
 				money -= 16
 				minut += 10

+ 2 - 2
locations/parkM.qsrc

@@ -154,7 +154,7 @@ if $ARGS[0] = 'sexrand3':
 		if curr_home = 1:
 			gt 'gskver', 'start'
 		else
-			gt 'park', 'start'
+			gt 'city_park', 'start'
 		end
 	end
 end
@@ -174,7 +174,7 @@ if $ARGS[0] = 'sexrand4':
 		if curr_home = 1:
 			gt 'gskver', 'start'
 		else
-			gt 'park', 'start'
+			gt 'city_park', 'start'
 		end
 	end
 end

+ 39 - 39
locations/parkivent.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = 'empty':
 	gs 'stat'
 	'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 
-	act 'Finish your walk':gt 'park', 'start'
+	act 'Finish your walk':gt 'city_park', 'start'
 
 	exit
 end
@@ -19,13 +19,13 @@ if $ARGS[0] = '1':
 		*clr & cla
 		'Hidden by a tree''s shadow, you notice a man standing there, he watches you and when you look back at him he shouts "Whore!" at you.'
 
-		act 'Silently leave':gt 'park', 'start'
+		act 'Silently leave':gt 'city_park', 'start'
 
 		act 'Tell him to shut up':
 			cla
 			'"Shut your trap, jackass." You''re surprised when you see him quickly running away.'
 
-			act 'Leave':gt 'park', 'start'
+			act 'Leave':gt 'city_park', 'start'
 		end
 
 		exit
@@ -83,7 +83,7 @@ if $ARGS[0] = '1':
 				if succubusQW >= 4:
 					act 'Continue': gt 'succubus', 'RapistFight'
 				else
-					act 'Continue':gt 'park', 'rape1'
+					act 'Continue':gt 'city_park', 'rape1'
 				end
 			else
 				cla
@@ -94,11 +94,11 @@ if $ARGS[0] = '1':
 					cls
 					locbegrand = rand(0, 4)
 
-					if locbegrand = 0:gt 'park', 'start'
+					if locbegrand = 0:gt 'city_park', 'start'
 					if locbegrand = 1:gt 'city_residential'
 					if locbegrand = 2:gt 'city_center'
 					if locbegrand = 3:gt 'nord'
-					if locbegrand = 4:gt 'lake', 'start'
+					if locbegrand = 4:gt 'city_lake', 'start'
 				end
 			end
 		end
@@ -125,14 +125,14 @@ if $ARGS[0] = '2':
 		*clr & cla
 		'You see a man sitting under a tree drinking beer. It''s the guy who fucked you here in the park a while ago. He looks at you and his sudden grin tells you that he remembers who you are.'
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 
 		exit
 	elseif pcs_apprnc >= 120 and parkday ! daystart and parkslut > 0:
 		*clr & cla
 		'From the bench under one of the trees a guy comes up to you. It''s the guy who fucked you here in the park a while back. He smiles and asks you "Hello again beautiful girl, do you mind if we do it once again?"'
 
-		act 'Walk away':gt 'park', 'start'
+		act 'Walk away':gt 'city_park', 'start'
 
 		act '"I don''t mind it all"':
 			cla
@@ -143,7 +143,7 @@ if $ARGS[0] = '2':
 				act '"Not this time, I''m afraid" (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'park', 'start'
+					gt 'city_park', 'start'
 				end
 			else
 				act 'Not this time, I''m afraid (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -164,7 +164,7 @@ if $ARGS[0] = '2':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'park', 'start'
+				act 'Leave':gt 'city_park', 'start'
 			end
 		end
 
@@ -182,7 +182,7 @@ if $ARGS[0] = '2':
 				act 'Fuck off, asshole (<<will_cost>> Willpower)':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
-					gt 'park', 'start'
+					gt 'city_park', 'start'
 				end
 			else
 				act 'Fuck off, asshole (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -205,11 +205,11 @@ if $ARGS[0] = '2':
 				gs 'arousal', 'vaginal', 20, 'prostitution'
 				gs 'arousal', 'end'
 
-				act 'Leave':gt 'park', 'start'
+				act 'Leave':gt 'city_park', 'start'
 			end
 		end
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 
 		exit
 	else
@@ -223,7 +223,7 @@ if $ARGS[0] = '3':
 	gs 'stat'
 	'As you walk through the park, you hear moans and groans coming out of the bush close to one of the paths.'
 
-	act 'Continue walking':gt 'park', 'start'
+	act 'Continue walking':gt 'city_park', 'start'
 
 	act 'Peek':
 		*clr & cla
@@ -234,7 +234,7 @@ if $ARGS[0] = '3':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 
 		if pcs_horny >= 50:
 			act 'Pry':
@@ -251,7 +251,7 @@ if $ARGS[0] = '3':
 					'While this is quite the sight to enjoy, you think it''s better not to get caught, so you silently move away.'
 				end
 
-				act 'Leave':gt 'park', 'start'
+				act 'Leave':gt 'city_park', 'start'
 			end
 		end
 
@@ -268,7 +268,7 @@ if $ARGS[0] = '3':
 					shantfoto += 1
 					'As you hide behind a tree, you start to take photos of them and watch them until they''re done. Once they are you silently move away and decide to find out who she was. Blackmailing her would be a nice source of income, you think to yourself.'
 
-					act 'Back to the park':gt 'park', 'start'
+					act 'Back to the park':gt 'city_park', 'start'
 				end
 
 				if fotoparkrand = 0:
@@ -344,7 +344,7 @@ if $ARGS[0] = '3':
 							locbegrand = rand(0, 4)
 
 							if locbegrand = 0:
-								act 'Take a look around to see where you are':gt 'park', 'start'
+								act 'Take a look around to see where you are':gt 'city_park', 'start'
 							elseif locbegrand = 1:
 								act 'Take a look around to see where you are':gt 'city_residential'
 							elseif locbegrand = 2:
@@ -352,14 +352,14 @@ if $ARGS[0] = '3':
 							elseif locbegrand = 3:
 								act 'Take a look around to see where you are':gt 'nord'
 							elseif locbegrand = 4:
-								act 'Take a look around to see where you are':gt 'lake', 'start'
+								act 'Take a look around to see where you are':gt 'city_lake', 'start'
 							end
 						end
 					end
 				end
 			end
 
-			act 'Back to the park':gt 'park', 'start'
+			act 'Back to the park':gt 'city_park', 'start'
 		end
 
 		exit
@@ -374,7 +374,7 @@ if $ARGS[0] = '4':
 		*clr & cla
 		'On one of the parks open grass area, you see a group of young people enjoying a barbecue. As you walk past them, a guy who is with them, walks up to you and asks if you would like to join them.'
 
-		act 'Decline and continue your walk':gt 'park', 'start'
+		act 'Decline and continue your walk':gt 'city_park', 'start'
 
 		act 'Agree and join them':
 			cla
@@ -399,7 +399,7 @@ if $ARGS[0] = '4':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
-							gt 'park', 'start'
+							gt 'city_park', 'start'
 						end
 					else
 						act 'Kick him in the his nuts and walk away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -453,7 +453,7 @@ if $ARGS[0] = '4':
 								gs 'arousal', 'end'
 								gs 'stat'
 
-								act 'Go home':gt 'park', 'start'
+								act 'Go home':gt 'city_park', 'start'
 							end
 						end
 					end
@@ -472,7 +472,7 @@ if $ARGS[0] = '5':
 	gs 'stat'
 	!!'You take a relaxing and refreshing walk through the park, trying to figure out the meaning of life.'
 
-	act 'Finish your walk':gt 'park', 'start'
+	act 'Finish your walk':gt 'city_park', 'start'
 
 	if yaq = 0 and student > 0:
 		*clr & cla
@@ -480,7 +480,7 @@ if $ARGS[0] = '5':
 		gs 'stat'
 		'As you''re walking and pondering, a man walks up to you. He introduces himself as Yaroslav and asks if you would like to earn some money.'
 
-		act '"No, thanks"':gt 'park', 'start'
+		act '"No, thanks"':gt 'city_park', 'start'
 
 		act '"I''m listening"':
 			cla
@@ -492,7 +492,7 @@ if $ARGS[0] = '5':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					gt 'park', 'start'
+					gt 'city_park', 'start'
 				end
 			else
 				act 'Turn him down (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -512,7 +512,7 @@ if $ARGS[0] = '5':
 					'"No hurry, just come by when you''ve got some free time, but I''m usually home in the evening, so there''s just that." he answers.'
 					'"Alright, thank you and see you soon I guess.", you say and walk away.'
 
-					act 'Finish your walk':gt 'park', 'start'
+					act 'Finish your walk':gt 'city_park', 'start'
 				end
 			end
 		end
@@ -533,7 +533,7 @@ if $ARGS[0] = '6':
 		cls
 		'As you were deep in your own thoughts, walking through the park, you''ve strayed of the normal path, realizing you''ve ended up in a somewhat shady area of it. Standing between two trees you notice a man waving at you.'
 
-		act 'Walk away':gt 'park', 'start'
+		act 'Walk away':gt 'city_park', 'start'
 
 		act 'Walk up to him':
 			*clr & cla
@@ -700,7 +700,7 @@ if $ARGS[0] = '6b':
 								gs 'arousal', 'end'
 								gs'stat'
 
-								act 'Leave':gt 'park', 'start'
+								act 'Leave':gt 'city_park', 'start'
 							end
 						end
 					end
@@ -723,7 +723,7 @@ if $ARGS[0] = '7':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'park', 'start'
+				gt 'city_park', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -739,7 +739,7 @@ if $ARGS[0] = '7':
 			'You nod and snort the white powder. It instantly hits you and you''re feeling on top of the world.'
 			'The guy looks at you and says, "Good shit, right? If you like it, come see me again, it only costs 2,000 <b>₽</b>."'
 
-			act 'Leave':gt 'park', 'start'
+			act 'Leave':gt 'city_park', 'start'
 
 			exit
 		end
@@ -765,10 +765,10 @@ if $ARGS[0] = '8':
 			stopboy = 0
 			'<<$loverdesc[lover_number]>> writes it in his phone and walks away from you all smiling.'
 
-			act 'Finish your walk':gt 'park', 'start'
+			act 'Finish your walk':gt 'city_park', 'start'
 		end
 
-		act 'Leave':gt 'park', 'start'
+		act 'Leave':gt 'city_park', 'start'
 
 		exit
 	else
@@ -785,7 +785,7 @@ if $ARGS[0] = '9':
 		cls
 		'As you walk through the park, you notice <<$loverdesc[lover_number]>> walking towards you.'
 
-		act 'Leave': loverrelation[lover_number]-= 1 & gt 'park', 'start'
+		act 'Leave': loverrelation[lover_number]-= 1 & gt 'city_park', 'start'
 
 		if boyonce[lover_number] = 0 or SUB = 0:
 			act 'Nice to talk':
@@ -794,13 +794,13 @@ if $ARGS[0] = '9':
 				minut += 15
 				'<<$loverdesc[lover_number]>> is happy about meeting you randomly and gives you a big hug. You have a nice short talk and kiss goodbye as you part ways again.'
 
-				act 'Finish your walk':gt 'park', 'start'
+				act 'Finish your walk':gt 'city_park', 'start'
 			end
 		elseif boyonce[lover_number] = 1 and SUB > 0:
 			'<<$loverdesc[lover_number]>> is happy to see you, quickly grabbing you by the hand leading you into a more secluded area of the park.'
 
 			act 'Follow <<$loverdesc[lover_number]>>.':
-				if loverGender[lover_number] = 0: gt 'event', 'park'
+				if loverGender[lover_number] = 0: gt 'event', 'city_park'
 				if loverGender[lover_number] = 1:
 					$telsob = '<<$loverdesc[lover_number]>>'
 					gt 'parksvid'
@@ -810,7 +810,7 @@ if $ARGS[0] = '9':
 			'<<$loverdesc[lover_number]>> is happy to see you, quickly grabbing you by the hand, wanting to lead you to a secluded area of the park.'
 
 			act 'Offer to sit on the bench':
-				if loverGender[lover_number] = 0: gt 'event', 'park'
+				if loverGender[lover_number] = 0: gt 'event', 'city_park'
 				if loverGender[lover_number] = 1:
 					$telsob = '<<$loverdesc[lover_number]>>'
 					gt 'parksvid'
@@ -823,7 +823,7 @@ if $ARGS[0] = '9':
 				minut += 15
 				'<<$loverdesc[lover_number]>> is happy about meeting you randomly and gives you a big hug. You have a nice short talk and kiss goodbye as you part ways again.'
 
-				act 'Finish your walk':gt 'park', 'start'
+				act 'Finish your walk':gt 'city_park', 'start'
 			end
 		end
 
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'find_baby':
 			!!	  act 'Take him with you':
 			!!end
 		end
-		act 'Finish your walk':gt 'park', 'start'
+		act 'Finish your walk':gt 'city_park', 'start'
 	else
 		gt 'parkivent', 'empty'
 	end

+ 1 - 1
locations/parks.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	$loc = 'parks'
 	$menu_loc = 'parks'
 	$menu_arg = 'start'
-	$locclass = 'park'
+	$locclass = 'city_park'
 	menu_off = 0
 	gs'stat'
 	'<center><B>Old Town Park</B></center>'

+ 3 - 3
locations/parksvid.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = '2':
 	if $home_town = 'pavlovsk':
 		act 'Kiss her and say goodbye': gt 'gskver', 'start'
 	else
-		act 'Kiss her and say goodbye': gt 'park', 'start'
+		act 'Kiss her and say goodbye': gt 'city_park', 'start'
 	end
 end
 
@@ -165,7 +165,7 @@ if $ARGS[0] = '3':
 		if $home_town = 'pavlovsk':
 			act 'Kiss her and say goodbye': gt 'gskver', 'start'
 		else
-			act 'Kiss her and say goodbye': gt 'park', 'start'
+			act 'Kiss her and say goodbye': gt 'city_park', 'start'
 		end
 		act 'Kiss her and invite her to your home': gt 'lezbsex', 'startloverhome'
 	else
@@ -173,7 +173,7 @@ if $ARGS[0] = '3':
 		if $home_town = 'pavlovsk':
 			act 'Leave': gt 'gskver', 'start'
 		else
-			act 'Leave': gt 'park', 'start'
+			act 'Leave': gt 'city_park', 'start'
 		end
 	end
 end

+ 3 - 3
locations/phone_selfies.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'selfies':
 	'<a href="exec:gt ''phone_selfies'', ''kitchen''">Kitchen selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''livingroom''">Livingroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''changingroom''">Changingroom selfies</a>'
-	'<a href="exec:gt ''phone_selfies'', ''park''">Park selfies</a>'
+	'<a href="exec:gt ''phone_selfies'', ''city_park''">Park selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''lockerroom''">Lockerroom selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''beach''">Beach selfies</a>'
 	'<a href="exec:gt ''phone_selfies'', ''gym''">Gym selfies</a>'
@@ -955,9 +955,9 @@ if $ARGS[0] = 'changingroom':
 	act 'Stop watching selfies': gt '<<$menu_loc>>', '<<$menu_arg>>'
 end
 
-if $ARGS[0] = 'park':
+if $ARGS[0] = 'city_park':
 	'<center><h4><font color="maroon">Park selfies</font></h4></center>'
-	$phone_loc = 'park'
+	$phone_loc = 'city_park'
 	*nl
 	gs 'phone_selfies', 'listretrieve'
 	

+ 4 - 4
locations/qwloc.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = '':
 	else
 		'The man returns your gaze for a moment before turning away.'
 
-		act 'Leave':gt 'park', 'luna'
+		act 'Leave':gt 'city_park', 'luna'
 	end
 end &! ---  ---
 
@@ -49,7 +49,7 @@ if $ARGS[0] = 'qwvladdy':
 			vladimirQW = 2
 			'You turn away from the man with a roll of your eyes and leave.'
 
-			act 'Leave':gt 'park', 'luna'
+			act 'Leave':gt 'city_park', 'luna'
 		end
 	end
 end &! --- qwladdy ---
@@ -66,7 +66,7 @@ if $ARGS[0] = 'qwnamedy':
 			vladimirQW = 2
 			'You decline and walk away, leaving the man standing.'
 
-			act 'Leave':gt 'park', 'luna'
+			act 'Leave':gt 'city_park', 'luna'
 		end
 
 		act 'Give him your number':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'qwnamedy':
 			vladimirday = daystart
 			'You tell Vladmimir your phone number and he writes it down in a small notebook with a leather cover.'
 
-			act 'Leave':gt 'park', 'luna'
+			act 'Leave':gt 'city_park', 'luna'
 		end
 	end
 end &! --- qwnamedy ---

+ 1 - 1
locations/street_event.qsrc

@@ -79,7 +79,7 @@ elseif $ARGS[0] = 'pavIndustrial':
 	streetev_hijack = 0
 	streetev_bf = 30
 	streetev_mistmeet = 5
-elseif $ARGS[0] = 'island':
+elseif $ARGS[0] = 'city_island':
 	$streetev_title = '<center><b>Island</b></center>'
 	streetev_rob = 0
 	streetev_hijack = 2

+ 5 - 5
locations/succubus.qsrc

@@ -90,7 +90,7 @@ end
 
 !!*********
 
-!!This is the 'park' and 'city_residential' call
+!!This is the 'city_park' and 'city_residential' call
 
 if $ARGS[0] = 'RapistFight':
 	gs 'stat'
@@ -772,8 +772,8 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'city_residential' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'city_center' & $sucgometka = ''
-			if sctemp = 4: $sucgoloc = 'park' & $sucgometka = 'start'
-			if sctemp = 5: $sucgoloc = 'lake' & $sucgometka = 'start'
+			if sctemp = 4: $sucgoloc = 'city_park' & $sucgometka = 'start'
+			if sctemp = 5: $sucgoloc = 'city_lake' & $sucgometka = 'start'
 		elseif sucslpzone = 2:
 			if sctemp = 1: $sucgoloc = 'pavCommercial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'pavResidential' & $sucgometka = ''
@@ -782,7 +782,7 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 5: $sucgoloc = 'gLake' & $sucgometka = ''
 		elseif sucslpzone = 3:
 			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
-			if sctemp = 2: $sucgoloc = 'park' & $sucgometka = 'start'
+			if sctemp = 2: $sucgoloc = 'city_park' & $sucgometka = 'start'
 			if sctemp = 3: $sucgoloc = 'pavCommercial' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'motel' & $sucgometka = ''
@@ -797,7 +797,7 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 2: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'motel' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'city_industrial' & $sucgometka = ''
-			if sctemp = 5: $sucgoloc = 'park' & $sucgometka = 'start'
+			if sctemp = 5: $sucgoloc = 'city_park' & $sucgometka = 'start'
 		end
 		killvar 'sctemp' & killvar 'sucslpzone'
 	end

+ 3 - 3
locations/svidboy.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'parksvid':
 		$svidboy_home = 'gskver'
 		$svidboy_home_arg = 'start'
 	else
-		$svidboy_home = 'park'
+		$svidboy_home = 'city_park'
 		$svidboy_home_arg = 'start'
 	end
 	cla
@@ -253,7 +253,7 @@ if $ARGS[0] = 'parksvid21':
 		$svidboy_home = 'gskver'
 		$svidboy_home_arg = 'start'
 	else
-		$svidboy_home = 'park'
+		$svidboy_home = 'city_park'
 		$svidboy_home_arg = 'start'
 	end
 	cla
@@ -304,7 +304,7 @@ if $ARGS[0] = 'parksvid22':
 		$svidboy_home = 'gskver'
 		$svidboy_home_arg = 'start'
 	else
-		$svidboy_home = 'park'
+		$svidboy_home = 'city_park'
 		$svidboy_home_arg = 'start'
 	end
 	cla

+ 3 - 3
locations/taxi.qsrc

@@ -70,9 +70,9 @@ if $ARGS[0] = 'locations':
 		end
 	end
 
-	if $loc ! 'island':
+	if $loc ! 'city_island':
 		act 'Go to the island':
-			$loc = 'island'
+			$loc = 'city_island'
 			gt 'taxi', 'trip'
 		end
 	end
@@ -373,7 +373,7 @@ if $ARGS[0] = 'random':
 	elseif rand(0,2) = 0:
 		gt 'city_center'
 	elseif rand(0,1) = 0:
-		gt 'island'
+		gt 'city_island'
 	else
 		gt 'city_industrial'
 	end

+ 7 - 7
locations/telefon.qsrc

@@ -311,7 +311,7 @@ if $ARGS[0] = 'NPCDate':
 	pcs_mood += 10
 	npc_rel[$Call4Date["NPC"]] += 3
 
-	if $Call4Date["Location"] = 'park':
+	if $Call4Date["Location"] = 'city_park':
 		if npc_gender[$Call4Date["NPC"]] = 0:
 			gt 'dateM','datepark'
 		else
@@ -382,7 +382,7 @@ if $ARGS[0] = 'SvetaCallsNPC':
 			if Call4Date["willAgree"]:
 				'<<$Call4Date["CallerName"]>>, "See you in the park in an hour."'
 
-				act 'Go':gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'park'
+				act 'Go':gt 'telefon', 'NPCDate', Call4Date["ContactIndex"], 'city_park'
 			else
 				gs 'telefon','telotkaz',$Call4Date["CallerName"]
 			end
@@ -1375,8 +1375,8 @@ if $ARGS[0] = 'Phone_camera_selfie':
 	elseif $locclass = 'changingroom':
 		$phone_loc = 'changingroom'
 		gs 'telefon', 'Phone_selfie_image'
-	elseif $locclass = 'park':
-		$phone_loc = 'park'
+	elseif $locclass = 'city_park':
+		$phone_loc = 'city_park'
 		gs 'telefon', 'Phone_selfie_image'
 	elseif $locclass = 'lockeroom':
 		$phone_loc = 'lockeroom'
@@ -1535,8 +1535,8 @@ if $ARGS[0] = 'Phone_camera':
 		$phone_loc = 'livingroom'
 	elseif $locclass = 'changingroom':
 		$phone_loc = 'changingroom'
-	elseif $locclass = 'park':
-		$phone_loc = 'park'
+	elseif $locclass = 'city_park':
+		$phone_loc = 'city_park'
 	elseif $locclass = 'lockeroom':
 		$phone_loc = 'lockeroom'
 	elseif $locclass = 'beach':
@@ -1553,7 +1553,7 @@ if $ARGS[0] = 'Phone_camera':
 	!! Take a selfie depending on which clothes you are wearing
 	$telefon['body'] += '<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''Phone_camera_selfie'' "><b>Take a selfie</b></a><br>'
 	!! Flashing selfie
-	if $clothingworntype ! 'nude' and ($phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
+	if $clothingworntype ! 'nude' and ($phone_loc = 'bedroom' or $phone_loc = 'kitchen' or $phone_loc = 'livingroom' or $phone_loc = 'changingroom' or $phone_loc = 'city_park' or $phone_loc = 'lockeroom' or $phone_loc = 'beach'):
 		if $phone_loc = 'bedroom':
 			$telefon['body'] += '
 			<a href="exec:photoskl_exp += 1 & gs ''telefon'', ''titflash'' "><b>Flash your tits for a selfie</b></a><br>

+ 1 - 1
locations/treeCircle.qsrc

@@ -17,7 +17,7 @@ $tpLocations[4] = 'Village'
 !	treeCircArg  = An argument to get the user to the right spot in the location.
 !Central Park Location
 $treeCircName['CentralPark'] = 'Central Park'
-$treeCircLoc['CentralPark'] = 'park'
+$treeCircLoc['CentralPark'] = 'city_park'
 $treeCircArg['CentralPark'] = 'start'
 !Pavlovsk Park Location
 $treeCircName['PavlovskPark'] = 'Pavlovsk Park'

+ 1 - 1
locations/univer.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'island'
+		gt 'city_island'
 	end
 
 	if student = 0 and abiturient = 0 and money >= 15000 and month < 9 and diplom = 0 and (age >= 17 or fakepassport = 1):