[added] pav_industrial as a new hub in Pavlovsk

[changed] The various links and descriptions to make Pav a 4 hub town
[changed] The factory setup to fit with being connected to the new hub

glife.qproj

@@ -549,6 +549,7 @@
 		<Location name="pavResidential"/>
 		<Location name="pavCommercial"/>
 		<Location name="pavCommercialOffices"/>
+		<Location name="pavIndustrial"/>
 		<Location name="leonid"/>
 		<Location name="gargazel"/>
 		<Location name="garfather"/>
@@ -557,11 +558,6 @@
 		<Location name="soniaDisco"/>
 		<Location name="gkafe"/>
 		<Location name="motherkafeboss"/>
-		<Location name="glake"/>
-		<Location name="gLakeNude"/>
-		<Location name="gLakeNudeEvent"/>
-		<Location name="gLakeNudeForest"/>
-		<Location name="LakeBoyZ"/>
 		<Location name="gpoli"/>
 		<Location name="therapist"/>
 		<Location name="gevent"/>
@@ -571,11 +567,6 @@
 		<Location name="cafe_parco"/>
 		<Location name="kotovEv"/>
 		<Location name="IvanEv"/>
-		<Location name="FedorEv"/>
-		<Location name="FedorEv2"/>
-		<Location name="FedorEv3"/>
-		<Location name="FedorEv4"/>
-		<Location name="FedorMisc"/>
 		<Location name="strela"/>
 		<Location name="kotovSex"/>
 		<Location name="kotovdom"/>
@@ -587,6 +578,20 @@
 		<Location name="ParChurch2"/>
 		<Location name="brothel"/>
 	</Folder>
+	<Folder name="pav_lake">
+		<Location name="glake"/>
+		<Location name="gLakeNude"/>
+		<Location name="gLakeNudeEvent"/>
+		<Location name="gLakeNudeForest"/>
+		<Location name="LakeBoyZ"/>
+	</Folder>
+	<Folder name="Fedor">
+		<Location name="FedorEv"/>
+		<Location name="FedorEv2"/>
+		<Location name="FedorEv3"/>
+		<Location name="FedorEv4"/>
+		<Location name="FedorMisc"/>
+	</Folder>
 	<Folder name="Starlets">
 		<Location name="DanceWhore1"/>
 		<Location name="DanceWhore2"/>

locations/Gshveyfab.qsrc

@@ -1,78 +1,48 @@
 # Gshveyfab
-$metka = $ARGS[0]
-$loc = $CURLOC
+
 $location_type = 'public_outdoors'
 
-if $ARGS[0] = 'start':
+if $ARGS[0] = 'tailor':
 	cla
 	*clr
+	$metka = 'tailor'
+	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
-	$menu_arg = 'start'
+	$menu_arg = 'tailor'
 	menu_off = 0
 	gs'stat'
+	'An elderly man is inspecting some repaired clothes, as you walk in, he stops and smiles gently, greeting you.'
+	'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
 
-	'<center><B>TEXTILE FACTORY, PARIS COMMUNE</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg"></center>'
-	'You''re standing in front one biggest employers in Pavlovsk, the local textile factory. It''s mostly known for making clothing for the G&M Store, which also opened up a store within the compound.'
-	'Opening hours are Monday to Friday, between 08:00 to 20:00.'
-	if hour >= 8 and hour < 20 and week >= 1 and week <= 5:
-		'Behind the security checkpoint you can see the <a href="exec:minut += 5 & GT ''Gshveyfab'', ''enter''">entrance</a> that every employee passes through.'
-	elseif hour < 8 or hour > 20 or week > 5:
-		'The factory is currently closed.'
-		'Opening hours are Monday through Friday:'
-		'First shift - 08:00 to 16:00'
-		'Second shift - 16:00 to 20:00'
-	end
-	if week < 6 and hour >= 8 and hour < 20:
-		*pl 'The local <a href="exec:torg = 0 & GT ''budgetclothes'',''start''">G&M Store</a> is currently open.'
-	else
-		*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
-	end
-
-	if week < 7 and hour >= 8 and hour < 15:
-		'In a smaller building right next to the factory is the local tailor shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 15:00.'
-		act 'Visit the tailor':
+	if money >= 500:
+		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 			cla
 			*clr
-			menu_off = 1
-			minut += 5
-			gs'stat'
-			'An elderly man is inspecting some repaired clothes, as you walk in, he stops and smiles gently, greeting you.'
-			'"Hello there young lady, do you want to adjust some of your clothing? It''ll cost you 500 <b>₽</b> per item."'
-
-			if money >= 500:
-				act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
-					cla
-					*clr
-					minut += 15
-					if CloStyle = 5 or $clothingworntype = 'exercise':
-						'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
-					else
-						money -= 500
-						dynamic '<<$clothingworntype>>B[<<clothingwornnumber>>] = pcs_hips'
-						'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment. The tailor is fast and only takes fifteen minutes until your clothes are ready.'
-						'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
-					end
-
-					act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
-				end
-
-				act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
-				act 'Resize all your clothes':gt 'portnoi2'
+			minut += 15
+			if CloStyle = 5 or $clothingworntype = 'exercise':
+				'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
+			else
+				money -= 500
+				dynamic '<<$clothingworntype>>B[<<clothingwornnumber>>] = pcs_hips'
+				'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment. The tailor is fast and only takes fifteen minutes until your clothes are ready.'
+				'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 			end
-			act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
 
+			act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
 		end
-	end
 
-	act 'Head to the residential area': minut += 15 & gt 'pavResidential'
-	act 'Head to the high street': minut += 15 & gt 'pavCommercial'
+		act 'Resize your other clothes':gt 'clothing', 'view_clothing_list', 'resize'
+		act 'Resize all your clothes':gt 'portnoi2'
+	end
+	act 'Leave': gt 'pavIndustrial'
 end
 
 if $ARGS[0] = 'enter':
 CLOSE ALL
 	cla
 	*clr
+	$metka = 'tailor'
+	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
 	$menu_arg = 'enter'
 	menu_off = 0
@@ -116,12 +86,14 @@ CLOSE ALL
 			gt 'Gshveyfab','enter'
 		end
 	end
-	act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
+	act 'Leave': minut += 5 & gt 'pavIndustrial'
 end
 
 if $ARGS[0] = 'job_start':
 	cla
 	*clr
+	$metka = 'tailor'
+	$loc = 'Gshveyfab'
 	$menu_loc = 'Gshveyfab'
 	$menu_arg = 'job_start'
 	menu_off = 0
@@ -186,7 +158,7 @@ if $ARGS[0] = 'job':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg" ></center>'
 	'You work hard throughout your shift at the factory. The foreman has you running all over the factory performing all type of tasks. You barely even have time to rest during the shift.'
 
-	act 'Leave': minut += 5 & gt 'Gshveyfab', 'start'
+	act 'Leave': minut += 5 & gt 'pavIndustrial'
 end
 
 --- Gshveyfab ---------------------------------

locations/budgetclothes.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 			minut += 3
 			gt 'torgcentr'
 		else
-			gt 'Gshveyfab', 'start'
+			gt 'pavIndustrial'
 		end
 	end
 	

locations/carF.qsrc

@@ -25,6 +25,7 @@ $enddrive = {
 	if cardrive = 23:gt 'gadukino'
 	if cardrive = 24:gt 'pavCommercial'
 	if cardrive = 25:gt 'island'
+	if cardrive = 26:gt 'pavIndustrial'
 }
 
 if $ARGS[0] = 'start':
@@ -88,6 +89,7 @@ if $ARGS[0] = 'salon':
 	if cardrive = 23:'Through the windshield, you see the huts of the village of Gadukino.'
 	if cardrive = 24:'Through the windshield, you can see the Old Town.'
 	if cardrive = 25:'You cross one of the bridges that leads to the island.'
+	if cardrive = 26:'Through the windshield, you can see the Old Town.'
 
 	if prava = 0:'You don''t have a driver''s license.'
 
@@ -451,6 +453,25 @@ if $ARGS[0] = 'salon':
 				end
 			end
 
+			if cardrive ! 26:
+				act 'Go to Pavlovsk Industrial Region':
+					cla
+					benz -= 1
+					teh -= rand(3, 6)
+					cardrive = 26
+
+					if cardrive < 20:
+						minut += 75
+						'You spend more than an hour on the highway going to Pavlovsk.'
+					else
+						minut += 15
+						'15 minutes later, you reach your destination.'
+					end
+
+					dynamic $enddrive
+				end
+			end
+
 			act 'Drive the St. Petersburg - Pavlovsk Highway':
 				'You drive out onto the highway.'
 				:oops

locations/pavCommercial.qsrc

@@ -47,6 +47,8 @@ else
 	end
 end
 *nl
+'Pavlovsk can be split into four regions, the commercial hub here, the residential suburbs, the industrial region and the Five Eight estate of Soviet era apartment blocks.'
+*nl
 'While the commerical hub of Pavlovsk is better maintained and a bit cleaner looking than other areas, it is still very much rural like the rest of the town, and even from here, you can still easily access the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial Palace</a> built by Catherine the Great, and the remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which now operates as a luxury hotel and restaurant.'
 *nl
 'A short distance away you can clearly see the golden domes of the <a href="exec:minut += 10 & gt ''ParChurch'',''start''">Church of St Nikolas</a>. It''s only a 10 minute walk to get there from here.'
@@ -135,14 +137,14 @@ else
 	$desc_txt2 = '<a href="exec:msg ''vocational school, which is closed right now. It will reopen again at 7:00''">vocational school</a>.'
 end
 
-'<br>If you continue past the shops, you''ll eventually find a <<$desc_txt2>> Beyond that is <a href="exec:minut += 15 & gt ''Gshveyfab'', ''start''">Paris Commune</a>, a large garment factory owned by G&M situated in the industrial area on the outskirts of town.'
+'<br>If you continue past the shops, you''ll eventually find a <<$desc_txt2>>.'
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
 act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
-
+act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
+act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
 act 'Walk to the train station':minut += 15 & gt 'pavtrain'
-
 act 'Walk to the city highway':minut += 15 & nroad = 20 & gt 'road'
 
 act 'Wait':gs 'obj_din', 'wait'

locations/pavComplex.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'start':
 	boynumBlock = 0
 	gs 'stat'
 !!	gs 'rolanapt' , 'rolanroute'
-	'<center><h2>Apartment Complex</h2></center>'
+	'<center><h2>Five Eight Estate</h2></center>'
 	if month >= 11 or month <= 3:
 		if hour >= 8 and hour <= 21:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/complexw.jpg"></center>'
@@ -71,8 +71,6 @@ if $ARGS[0] = 'start':
 		'The three buildings surround a meager courtyard, which has changed over the years to now include a kid''s playground that occupies most of the small outdoor space. A few benches and tables surround it, and there''s a handful of small utility sheds tucked away in the corner for tenants to use if they''re willing to pay for the extra space.'
 		*nl
 		' Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pavComplex'', ''garages''">garages</a> and storage space for tenants. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
-	else
-		'<<$gcartext>>'
 	end
 
 	if Enable_tablemap = 0:
@@ -126,15 +124,17 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	if StoryLine = 1: '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
+
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1:act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pavSharedApt', 'start'
-	act 'Walk to the residential street':minut += 2 & gt 'pavResidential'
+	act 'Walk to the residential area':minut += 2 & gt 'pavResidential'
+	act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+	act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif storyline = 1 and (home_owned[2] = 0 or pavSharedAptEnabled = 1):
 		act 'Go to your parent''s apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
-	else
-		act 'Go to the Southern apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	end
 !!	act 'Go to the Eastern apartment building':
 !!		minut += 1
@@ -150,7 +150,6 @@ if $ARGS[0] = 'start':
 		act 'Go to your apartment building':minut += 1 & gt 'pavComplexb3', 'etaj_1'
 	end
 	act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
-	act 'Go to the apartment garages':minut += 1 & gt 'pavComplex', 'garages'
 	act 'Sit on a bench':gt 'pavaptcourtev', 'bench'
 end
 

locations/pavIndustrial.qsrc

@@ -0,0 +1,102 @@
+# pavIndustrial
+
+CLOSE ALL
+
+$metka = ''
+$loc = 'pavIndustrial'
+$location_type = 'public_outdoors'
+$metkaStreet = ''
+$locStreet = 'pavIndustrial'
+$menu_loc = 'pavIndustrial'
+$menu_arg = ''
+menu_off = 0
+
+if sound = 0:
+	if month >=11 and month <= 12 or month >=1 and month <=3:
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/zima.mp3',30
+		if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+	else
+		if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street_leto.mp3',30
+		if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
+	end
+end
+
+cla
+*clr
+litltown = 1
+alkoblock = 0
+boynumBlock = 0
+
+!call random events from [street_events], and display them before show location.
+if streetevent_hour + 2 < hour:gt'street_event','pavIndustrial', 'main'
+
+'<center><h2>Pavlovsk Industrial District</h2></center>'
+'<center><img <<$set_imgh>> src="images/locations/pavlovsk/factory/gshveyfab.jpg"></center>'
+*nl
+'This is the Industrial region of Pavlovsk, it houses some factories and warehouses along with the old houses that are small and run down.'
+*nl
+'This area is dominated by one biggest employers in Pavlovsk, the local textile factory. It''s owned by G&M who opened up a store opposite.'
+
+if hour >= 8 and hour < 20 and week >= 1 and week <= 5:
+	'Behind the security checkpoint you can see the <a href="exec:minut += 5 & GT ''Gshveyfab'', ''enter''">entrance</a> that every employee passes through.'
+elseif hour < 8 or hour > 20 or week > 5:
+	'The factory is currently closed.'
+end
+'Opening hours are Monday through Friday:'
+'First shift - 08:00 to 16:00'
+'Second shift - 16:00 to 20:00'
+*nl
+'In a smaller building right next to the factory is the local tailor shop, a service offered by the factory. Opening hours are Monday to Saturday, between 08:00 to 15:00.'
+
+gs'street_event','pavIndustrial', 'extras'
+
+if AlbFather >= 1:
+	if AlbFaterBlackTime = 0:AlbFaterBlackTime = totminut + 2880
+
+	'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
+end
+
+if AlbFaterBlackTime > 0 and AlbFaterBlackTime <= totminut and hour >= 14 and AlbFather = 1:gt 'AlbFatherQW'
+if hour >= 14 and hour <= 22 and AlbFather = 2 and AlbZaDay + 30 < daystart and year > 2015:
+	gt 'AlbStarsEnd'
+end
+
+if StoryLine > 0 and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1:
+	motherWorry = 1
+end
+
+if rand(1, 5) >= 4 and pav_slut >= 50:
+	if pav_slut < 75:
+		'<br>You catch people staring at you intently, as if they''re supposed to know who you are but can''t quite remember why. You sincerely hope they don''t realize your promiscuous adventures are the reason why. The occasional person chuckling and pointing at you crushes those hopes, and you quickly keep walking before they get a chance to say anything.'
+	elseif pav_slut < 100:
+		'<br>People look at you with lewd grins on their faces, some of them even making vulgar gestures. Looks like they know what you''ve been up to.'
+	else
+		'<br>Everywhere you go, people recognize you as a whore. Some even come over and slap you on the ass, claiming they know you like it when they do, or claiming they want to sample your goods. An elderly woman sitting on a bench calls out to you, loudly calling you a slut and a whore. You hide your face and run away as fast as you can, before she can draw too much attention to you.'
+	end
+end
+
+gs 'stat'
+
+if car > 0 and cardrive = 26:
+	cardrive = 26
+	'Your <a href="exec:gs ''carF'', ''start''">car<<$car>></a> is parked in the street.'
+end
+
+if week < 7 and hour >= 8 and hour < 15:
+	act 'Visit the tailor': gt 'Gshveyfab', 'tailor'
+end
+
+if week < 6 and hour >= 8 and hour < 20:
+	*pl 'The local <a href="exec:torg = 0 & GT ''budgetclothes'',''start''">G&M Store</a> is currently open.'
+else
+	*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
+end
+
+act 'Walk to the residential area':minut += 5 & gt 'pavResidential'
+
+act 'Wait':gs 'obj_din', 'wait'
+
+if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
+
+--- pavCommercial ---------------------------------
+

locations/pavResidential.qsrc

@@ -46,7 +46,7 @@ else
 	end
 end
 
-'<br>The residential area of a provincial town in Russia that has a population of roughly 15,000 people. The area is rural with its old and quaint buildings, dusty roads and pockets of overgrown vegetation stretching out far and wide, but some would say that just adds to the town''s rustic charm. Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> built by Catherine the Great, with its surrounding gardens and forest, and the recently remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which is now a luxury hotel and restaurant, it looks much like all the other small towns in the region.'
+'<br>The residential area of a provincial town in Russia that has a population of roughly 15,000 people. This area is suburban with more modern houses, dusty roads and pockets of overgrown vegetation stretching out far and wide, but some would say that just adds to the town''s rustic charm. Apart from the old <a href="exec:view''images/locations/pavlovsk/palace/pav_palace.jpg''">Imperial palace</a> built by Catherine the Great, with its surrounding gardens and forest, and the recently remodeled <a href="exec:view''images/locations/pavlovsk/fortress/bip_hotel.png''">Bip fortress</a> which is now a luxury hotel and restaurant.'
 '<br>Even from here you can spot the <a href="exec:minut += 5 & gt ''ParChurch'',''start''">Church of St Nikolas</a>, the tallest building in town.'
 
 gs'street_event','pavResidential', 'extras'
@@ -107,16 +107,6 @@ if car > 0 and cardrive = 20:
 	'Your <a href="exec:gs ''carF'', ''start''">car<<$car>></a> is parked in the street.'
 end
 
-if home_owned[2] = 1:
-	'<br>You live in the older, rougher looking parts of Pavlovsk. Right along the street is the entrance to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''">Southern apartment building</a>, which is where your family and you live on the second floor. <<$gcartext>>'
-elseif StoryLine = 1:
-	'<br>You are standing near one of the apartment blocks in the old part of Pavlovsk, and the door to the <a href="exec:minut += 2 & GT ''pavcomplex'',''start''"> Southern apartment building</a> is right there. Your parents live here, but you are no longer welcome in their home. <<$gcartext>>'
-else
-	'<<$gcartext>>'
-end
-
-if StoryLine = 1: '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & GT ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
-
 if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<a href="exec:gt ''FedorEv4'', ''Home Entrance''">Fedor''s</a> house.'
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$locM = ''pavResidential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
@@ -156,8 +146,9 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 	killvar 'InvitationToDimkaNYparty'
 end
 
-act 'Walk to the apartment complex':minut += 2 & gt 'pavcomplex', 'start'
+act 'Walk to the Five Eight estate':minut += 2 & gt 'pavcomplex', 'start'
 act 'Walk to the commercial area':minut += 5 & gt 'pavCommercial'
+act 'Walk to the Industrial region':minut += 5 & gt 'pavIndustrial'
 
 act 'Wait':gs 'obj_din', 'wait'