Browse Source

[Chaged] Renamed Nord to city_industrial

KevinSmarts 4 years ago
parent
commit
5be4fa2ea2

+ 1 - 1
locations/LCwork.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = 'start3':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave the apartment building':money += randLCpay & gt 'Nord'
+		act 'Leave the apartment building':money += randLCpay & gt 'city_industrial'
 	end
 end
 

+ 1 - 1
locations/abduction.qsrc

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

+ 25 - 25
locations/autosalonF.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'manager1':
 	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
 	'"With how the economy is right now, we can''t accept payment by installments at this time, I''m afraid", he apologizes, "and a few new laws have been passed, too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
-	act 'Leave':gt 'Nord'
+	act 'Leave':gt 'city_industrial'
 
 	if karta + bankDebtLimit >= 400000:
 		act 'Buy a Kalina VAZ (400 th.RUB)':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -101,7 +101,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -122,7 +122,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -143,7 +143,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -164,7 +164,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -185,7 +185,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -206,7 +206,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -227,7 +227,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -248,7 +248,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -269,7 +269,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -290,7 +290,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -332,7 +332,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -353,7 +353,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -395,7 +395,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -416,7 +416,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -437,7 +437,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -458,7 +458,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -479,7 +479,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -521,7 +521,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -542,7 +542,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 
@@ -563,7 +563,7 @@ if $ARGS[0] = 'manager1':
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
 			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
 
-			act 'Leave':gt'Nord'
+			act 'Leave':gt'city_industrial'
 		end
 	end
 end

+ 3 - 3
locations/autoservisF.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
 						'Since he tells you that it''s not gonna take long, you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, the car is ready and you pay <<normrem>> <b>₽</b>.'
 
-						act 'Leave': minut += 5 & gt 'Nord'
+						act 'Leave': minut += 5 & gt 'city_industrial'
 					end
 				end
 			end
@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 					'The car looks brandnew! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
 					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he was joking or not.'
 
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 end
 
 --- autoservisF ---------------------------------

+ 12 - 12
locations/autotraidF.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
-	act 'Leave': minut += 5 & gt 'Nord'
+	act 'Leave': minut += 5 & gt 'city_industrial'
 	
 	if hour <= 17:
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
@@ -37,12 +37,12 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
 	gs 'avb'
 
-	act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 	
 	if cardrive = 9 and car > 0:
 		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
-		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		
 		act 'Sell ​your car (<<bupay>> <b>₽</b>) (1:00)':
 			cla
@@ -54,7 +54,7 @@ if $ARGS[0] = 'manager1':
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you see something you like."'
 
-			act 'Leave': killvar 'bupay' & minut += 5 & gt 'Nord'
+			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		end
 	elseif cardrive ! 9:
 		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
@@ -120,7 +120,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -151,7 +151,7 @@ if $ARGS[0] = 'car':
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -213,7 +213,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -244,7 +244,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -275,7 +275,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt'Nord'
+					act 'Leave': minut += 5 & gt'city_industrial'
 				end
 			end
 		end
@@ -307,7 +307,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end
@@ -339,7 +339,7 @@ if $ARGS[0] = 'car':
 					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
-					act 'Leave': minut += 5 & gt 'Nord'
+					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
 			end
 		end

+ 3 - 3
locations/bordel.qsrc

@@ -10,11 +10,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	elseif pcs_apprnc < 100:
 		'"Look at you, no one will pay for such a product, get cleaned up and come back."'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	else
 		act 'In the room':gt 'bordel', 'brothel'
 	end
@@ -39,7 +39,7 @@ if $ARGS[0] = 'brothel':
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
-			gt 'Nord', 'redlight'
+			gt 'city_industrial', 'redlight'
 		else
 			cla
 			'You can''t go outside naked.'

+ 1 - 1
locations/carF.qsrc

@@ -3,7 +3,7 @@
 $enddrive = {
 	if cardrive = 1:gt 'street'
 	if cardrive = 2:gt 'down'
-	if cardrive = 3:gt 'Nord'
+	if cardrive = 3:gt 'city_industrial'
 	if cardrive = 4:gt 'lake', 'start'
 	if cardrive = 5:gt 'park', 'start'
 	if cardrive = 6:gt 'zaprF', 'start'

+ 14 - 14
locations/Nord.qsrc → locations/city_industrial.qsrc

@@ -1,12 +1,12 @@
-# Nord
+# city_industrial
 
 if $ARGS[0] = '':
 	$metka = ''
-	$loc = 'Nord'
+	$loc = 'city_industrial'
 	$metkaStreet = ''
-	$locStreet = 'Nord'
+	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'Nord'
+	$menu_loc = 'city_industrial'
 	$menu_arg = ''
 	menu_off = 0
 	CLOSE ALL
@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 	gs 'stat'
 
 	!call random events from [street_events], and display them before show location.
-	if streetevent_hour + 2 < hour: gt 'street_event','Nord', 'main'
+	if streetevent_hour + 2 < hour: gt 'street_event','city_industrial', 'main'
 
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Industrial Region</b></center>'
@@ -35,16 +35,16 @@ if $ARGS[0] = '':
 		end
 	else
 		if hour >= 8 and hour <= 21:
-			'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/industrial/city_industrial.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord2.jpg"></center>'
 		end
 	end
 
-	gs'street_event','Nord', 'extras'
+	gs'street_event','city_industrial', 'extras'
 
 	act 'Walk to the main road to Pavlovsk (0:15)': minut += 15 & nroad = 0 & gt'road'
-	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'Nord', 'redlight'
+	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'city_industrial', 'redlight'
 
 	act 'Wait':gs 'obj_din', 'wait'
 
@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 	'The towns <a href="exec:minut += 60 & gt ''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 = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+		'You can see the <a href="exec:$locM = ''city_industrial'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 	else
 		'The kiosk is closed between 23:00 and 07:00.'
 	end
@@ -125,11 +125,11 @@ end
 
 if $ARGS[0] = 'redlight':
 	$metka = 'redlight'
-	$loc = 'Nord'
+	$loc = 'city_industrial'
 	$metkaStreet = 'redlight'
-	$locStreet = 'Nord'
+	$locStreet = 'city_industrial'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'Nord'
+	$menu_loc = 'city_industrial'
 	$menu_arg = 'redlight'
 	menu_off = 0
 	CLOSE ALL
@@ -164,7 +164,7 @@ if $ARGS[0] = 'redlight':
 	end
 	if bordel > 0 and (hour >= 20 or hour <= 3):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
-	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'Nord'
+	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
 	act 'Wait':gs 'obj_din', 'wait'
 	
@@ -186,5 +186,5 @@ if $ARGS[0] = 'redlight':
 end
 
 
---- Nord ---------------------------------
+--- city_industrial ---------------------------------
 

+ 3 - 3
locations/metro.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	elseif $loc = 'down':
 		'<center><b><font color="maroon">City Center</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platcenter.jpg"></center>'
-	elseif $loc = 'Nord':
+	elseif $loc = 'city_industrial':
 		'<center><b><font color="maroon">City Industrial Region</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platindust.jpg"></center>'
 !!new locations for the metro, you will have to see how the code works and for now the island will be commented out until we add that area of the city
@@ -61,9 +61,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if $loc ! 'Nord':
+		if $loc ! 'city_industrial':
 			act 'Go to the <b>City Industrial Region</b> (16 <b>₽</b>)':
-				$loc = 'Nord'
+				$loc = 'city_industrial'
 				$metka = ''
 				money -= 16
 				minut += 10

+ 1 - 1
locations/park.qsrc

@@ -244,7 +244,7 @@ if $ARGS[0] = 'exit':
 	!!act 'Go to the highway near the park (0:05)':minut += 5 & gt 'park', 'whore'
 	act 'Go to the Residential Area (0:20)':minut += 20 & gt 'street'
 	act 'Go to the City Center (0:35)':minut += 35 & gt 'down'
-	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'Nord'
+	act 'Go to the City Industrial Region (1:00)':minut += 60 & gt 'city_industrial'
 end
 
 if $ARGS[0] = 'luna':

+ 4 - 4
locations/pornstudio.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/studia_0.jpg"></center>'
 
-	act 'Leave': gt 'Nord', 'redlight'
+	act 'Leave': gt 'city_industrial', 'redlight'
 
 	if hour < 10 or hour > 22:
 		'The Porn studio is closed. Opening hours are between 10 and 22'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 				'Moving away from the studio near you hear someone else came out of a nearby building and follow for you.'
 				'<font color="magenta"> "Avoid deserted places, maybe this will blow over"</font> you reassure yourself, and carry on.'
 
-				act 'Leave': gt 'Nord', 'redlight'
+				act 'Leave': gt 'city_industrial', 'redlight'
 			end
 		elseif workDisk = 3 and week = 5:
 			act 'Give the envelope':
@@ -81,7 +81,7 @@ if $ARGS[0] = 'start':
 					'You give the envelope to the manager and he gives you 5,000 <b>₽</b>.'
 				end
 
-				act 'Leave': gt 'Nord', 'redlight'
+				act 'Leave': gt 'city_industrial', 'redlight'
 			end
 		end
 	end
@@ -253,7 +253,7 @@ if $ARGS[0] = 'delivery':
 	'We made inquiries about you, and everything seems in order. Essentially, we give you a thumb drive, you deliver it to the sauna, they give you an envelope and you bring it to us. Immediately.'
 	'Upon delivery of envolope you get 5000 <b>₽</b>. Deliveries are available every Friday, after the studio has opened. If you agree, then visit any Friday, and choose a safe mode of transport.'
 
-	act 'No, I don''t think it''s for me (leave)':bomzQW = -1 & gt 'Nord', 'redlight'
+	act 'No, I don''t think it''s for me (leave)':bomzQW = -1 & gt 'city_industrial', 'redlight'
 
 	act 'Agree to work':
 		cls

+ 6 - 6
locations/sexshop.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'In the basement are the private booths for viewing porn movies (50 <b>₽</b> 15 minutes).'
 
-	act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+	act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
 
 	if analplug = 1 and dildo = 1 and hotcat >= 5 and Peter = 0:
 		if rand(0,1) = 1:
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/peter.jpg"></center>'
 				'I''m Peter, I''ve been watching you for a long time. I often see you here. I find you rather interesting...'
 
-				act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+				act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
 				act 'Go with Peter': gt 'Peterroom', 'start'
 			end
 		end
@@ -940,7 +940,7 @@ if $ARGS[0] = 'kendra':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend.jpg"></center>'
 			'You smile to her. "Sorry, no. I still don''t belong to anyone."'
 			'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an Ebony Mistress. Perhaps we will meet again and you will change your mind. I go to the University on the island, you should stop by sometime." She gives you directions to which dorm building is hers, and which floor and room number is her dorm room. With that you both say your goodbyes and she returns to shopping. As do you.'
-			act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+			act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
 			act 'Go back to shopping':gt 'sexshop', 'start'
 		end
 		act 'Yes':
@@ -975,7 +975,7 @@ if $ARGS[0] = 'kendra':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				minut += 5
-				gt 'Nord', 'redlight'
+				gt 'city_industrial', 'redlight'
 			end
 		else
 			act 'Leave the shop (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'kendra':
 		'You decide to tell her. "My name is <<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?"'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. My name is Kendra, but you can call me Mistress Kendra." She says in confidence.'
 		'"Oh" You reply, so she is one of those.'
-		act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+		act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
 		act 'Go back to shopping':gt 'sexshop', 'start'
 		act 'Talk to her':
 			*clr & cla
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'kendra':
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend0.jpg"></center>'
 		'As you browse the store, you see a very attractive young black woman about your age trying on latex clothes. She notices you at about the same time.'
 		'She gives you a quick once over, and then stops paying attention to you. After a few moments she moves to another section of the store.'
-		act 'Leave': minut += 5 & gt 'Nord', 'redlight'
+		act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
 		act 'Go back to shopping':gt 'sexshop', 'start'
 	end
 end

+ 2 - 2
locations/shop.qsrc

@@ -125,11 +125,11 @@ if $shoplocation = 'main':
 	!! This is connected to the trade mission
 	if TorgPredZ > 0:
 		!! the location of the shop hasn''t been done today
-		if ($loc = 'street' and StreetShopTPday ! daystart) or ($loc = 'Nord' and nordShopTPday ! daystart) or ($loc = 'torgcentr' and downShopTPday ! daystart):
+		if ($loc = 'street' and StreetShopTPday ! daystart) or ($loc = 'city_industrial' and nordShopTPday ! daystart) or ($loc = 'torgcentr' and downShopTPday ! daystart):
 			act 'Arrange products':
 				*clr & cla
 				if $loc = 'street':StreetShopTPday = daystart
-				if $loc = 'Nord':nordShopTPday = daystart
+				if $loc = 'city_industrial':nordShopTPday = daystart
 				if $loc = 'torgcentr':downShopTPday = daystart
 
 				mtprand = rand(40, 130)

+ 3 - 3
locations/street_event.qsrc

@@ -1,6 +1,6 @@
 # street_event
 
-!{$arg[0]='down','street','Nord' for trigger position.  if call this with gs, $curloc work the same.
+!{$arg[0]='down','street','city_industrial' for trigger position.  if call this with gs, $curloc work the same.
 1. location indepent events, list: rape, rob, hijack, ask phonenumber, no pantie&skirt, $street_cum, $mobile_check
  all events were only in [street], except shantpopala duplicate in [street][down].
  original event chance in [street]:
@@ -12,7 +12,7 @@
 2. home-related events: check if player live here (workDolgDay, vladimirday, pcs_magik >= 1 and mainQW = 0, hour = meethour).
 [street]: home_owned[1] > 0 for korr
 [down]:tanwork = 1 for house, student > 0 for dorm
-[Nord]:none for now. use (train station) as position, if no home in city.
+[city_industrial]:none for now. use (train station) as position, if no home in city.
 Known issue: boyfriend/vladimir may wait you in both place, if you rent house in [street] and study in university/work in Tanya
 
 
@@ -43,7 +43,7 @@ elseif $ARGS[0] = 'down':
 		streetev_home = 1
 		$streetev_home = 'near the entrance to your home'
 	end
-elseif $ARGS[0] = 'Nord':
+elseif $ARGS[0] = 'city_industrial':
 	$streetev_title = '<center><b>City industrial region</b></center>'
 	streetev_rob = 2
 	streetev_hijack = 0

+ 3 - 3
locations/street_walker.qsrc

@@ -44,7 +44,7 @@ if $ARGS[0] = 'start':
 			end
 		else
 			if hour >= 8 and hour <= 21:
-				'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/industrial/city_industrial.jpg"></center>'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/nord2.jpg"></center>'
 			end
@@ -84,7 +84,7 @@ if $ARGS[0] = 'work':
 	menu_off = 0
 	if $loc = 'down':
 		prst_loc = 0
-	elseif $loc = 'Nord':
+	elseif $loc = 'city_industrial':
 		prst_loc = 1
 	elseif $loc = 'street':
 		prst_loc = 2
@@ -797,7 +797,7 @@ if $ARGS[0] = 'end':
 	if prst_loc = 0:
 		gt 'down'
 	elseif prst_loc = 1:
-		gt 'Nord', 'redlight'
+		gt 'city_industrial', 'redlight'
 	else
 		gt 'street'
 	end

+ 2 - 2
locations/stripclub.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/stripclub/stripclub.jpg"></center>'
 	*nl
 
-	act 'Leave': gt 'Nord', 'redlight'
+	act 'Leave': gt 'city_industrial', 'redlight'
 
 	if hour = 2:
 		'The strip club is closing and security guard ushers everyone out.'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'manager':
 		'"Nearly..." you say dejectingly.'
 		'"Right. You need to leave this establishment, be sure to come back when you are old enough." he tells you.'
 
-		act 'Leave':gt 'Nord', 'redlight'
+		act 'Leave':gt 'city_industrial', 'redlight'
 	end
 end
 

+ 4 - 4
locations/succubus.qsrc

@@ -769,7 +769,7 @@ if $args[0] = 'sucwalkinggo':
 	else
 		sctemp = rand(1,5)
 		if sucslpzone = 1:
-			if sctemp = 1: $sucgoloc = 'Nord' & $sucgometka = ''
+			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'street' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'down' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'park' & $sucgometka = 'start'
@@ -781,7 +781,7 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'gLake' & $sucgometka = ''
 		elseif sucslpzone = 3:
-			if sctemp = 1: $sucgoloc = 'Nord' & $sucgometka = ''
+			if sctemp = 1: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'park' & $sucgometka = 'start'
 			if sctemp = 3: $sucgoloc = 'pavCommercial' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
@@ -791,12 +791,12 @@ if $args[0] = 'sucwalkinggo':
 			if sctemp = 2: $sucgoloc = 'liames' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'parks' & $sucgometka = ''
 			if sctemp = 4: $sucgoloc = 'pavtrain' & $sucgometka = ''
-			if sctemp = 5: $sucgoloc = 'Nord' & $sucgometka = ''
+			if sctemp = 5: $sucgoloc = 'city_industrial' & $sucgometka = ''
 		elseif sucslpzone = 5:
 			if sctemp = 1: $sucgoloc = 'gadukino' & $sucgometka = ''
 			if sctemp = 2: $sucgoloc = 'pavtrain' & $sucgometka = ''
 			if sctemp = 3: $sucgoloc = 'motel' & $sucgometka = ''
-			if sctemp = 4: $sucgoloc = 'Nord' & $sucgometka = ''
+			if sctemp = 4: $sucgoloc = 'city_industrial' & $sucgometka = ''
 			if sctemp = 5: $sucgoloc = 'park' & $sucgometka = 'start'
 		end
 		killvar 'sctemp' & killvar 'sucslpzone'

+ 5 - 5
locations/taxi.qsrc

@@ -54,17 +54,17 @@ if $ARGS[0] = 'locations':
 		end
 	end
 
-	if $loc ! 'Nord' or $metka ! 'redlight':
+	if $loc ! 'city_industrial' or $metka ! 'redlight':
 		act 'Go to the city''s red light district':
-			$loc = 'Nord'
+			$loc = 'city_industrial'
 			$metka = 'redlight'
 			gt 'taxi', 'trip'
 		end
 	end
 
-	if $loc ! 'Nord' or $metka = 'redlight':
+	if $loc ! 'city_industrial' or $metka = 'redlight':
 		act 'Go to the city''s industrial region':
-			$loc = 'Nord'
+			$loc = 'city_industrial'
 			$metka = ''
 			gt 'taxi', 'trip'
 		end
@@ -375,7 +375,7 @@ if $ARGS[0] = 'random':
 	elseif rand(0,1) = 0:
 		gt 'island'
 	else
-		gt 'Nord'
+		gt 'city_industrial'
 	end
 end
 

+ 5 - 5
locations/trashplace.qsrc

@@ -78,7 +78,7 @@ $bomzstartqwestdi = {
 						act 'Refuse and leave (<<will_cost>> Willpower)':
 							bomzQW = -1
 							gs 'willpower', 'pay', 'resist'
-							gt 'Nord'
+							gt 'city_industrial'
 						end
 					else
 						act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -101,7 +101,7 @@ $bomzstartqwestdi = {
 
 								gs 'willpower', 'exhib', 'resist'
 								if will_cost <= pcs_willpwr:
-									act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'Nord'
+									act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_industrial'
 								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>'
 								end
@@ -150,7 +150,7 @@ $bomzstartqwestdi = {
 										'"You do realise a bird has made a nest in your panties? Might want to find it a new home. Do not forget to come on Thursday."'
 									end
 
-									act 'Leave':bomzQW = 1 & gt 'Nord'
+									act 'Leave':bomzQW = 1 & gt 'city_industrial'
 								end
 								exit
 							end
@@ -159,7 +159,7 @@ $bomzstartqwestdi = {
 						end
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':bomzQW = 1 & gt 'Nord'
+						act 'Leave':bomzQW = 1 & gt 'city_industrial'
 					end
 				end
 			end
@@ -180,7 +180,7 @@ $workbomzdi = {
 		act 'No, I don''t think it''s for me (<<will_cost>> Willpower)':
 			bomzQW = -1
 			gs 'willpower', 'pay', 'resist'
-			gt 'Nord'
+			gt 'city_industrial'
 		end
 	else
 		act 'No, I don''t think it''s for me (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 1 - 1
locations/version.qsrc

@@ -587,7 +587,7 @@ act 'Return': gt 'start'
 '- Added the Hairsalon in the Mall'
 '- Added the Barbershop in the small town, cheaper & faster than the hairsalon, but doesn''t do braided hair'
 '- While I''m not a native english speaker, I tried to fix some of the broken english'
-'-- Done in following locations: street, down, Nord, club, park'
+'-- Done in following locations: street, down, city_industrial, club, park'
 '- Additional conditions to get into the club.'
 '-- Jeans, Shorts, Pants and Kis-Clothes can get you in.'
 '--- Jeans, Shorts and Pants require a certain level of looks/beauty (pcs_apprnc) to get you in.'

+ 3 - 3
locations/youry.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	act 'Leave':
 		cla
 		minut += 5
-		gt 'nord'
+		gt 'city_industrial'
 	end
 
 	act 'Ring the doorbell':
@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 			'You ring the doorbell, but nobody answers. Yuri''s probably at work.'
 		end
 
-		act 'Leave':gt 'Nord'
+		act 'Leave':gt 'city_industrial'
 	end
 end
 
@@ -207,7 +207,7 @@ if $ARGS[0] = 'quest':
 													gs 'arousal', 'end'
 													gs 'stat'
 													
-													act 'Leave':gt 'nord'
+													act 'Leave':gt 'city_industrial'
 												end
 											end
 										end