Przeglądaj źródła

[Changed[ Split the red light district in to it's own file

Kevin_Smarts 2 lat temu
rodzic
commit
a588b5f23b

+ 4 - 3
glife.qproj

@@ -346,8 +346,6 @@
 	<Folder name="EfimovRA">
 		<Location name="billiard"/>
 		<Location name="billsvid"/>
-		<Location name="bordel"/>
-		<Location name="bordelv"/>
 		<Location name="bouling"/>
 		<Location name="kafesvid"/>
 		<Location name="kamera"/>
@@ -865,7 +863,7 @@
 		<Location name="sentence"/>
 		<Location name="shoplifting"/>
 	</Folder>
-	<Folder name="North Side">
+	<Folder name="City Industrial">
 		<Location name="city_industrial"/>
 		<Location name="city_industrial_train"/>
 		<Location name="Terminal"/>
@@ -887,6 +885,9 @@
 		<Location name="obekt2"/>
 	</Folder>
 	<Folder name="Red Light">
+		<Location name="city_redlight"/>
+		<Location name="bordel"/>
+		<Location name="bordelv"/>
 		<Location name="sexshop"/>
 		<Location name="stripclub"/>
 		<Location name="stwork"/>

+ 3 - 3
locations/bordel.qsrc

@@ -12,11 +12,11 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
-		act 'Leave':gt 'city_industrial', 'redlight'
+		act 'Leave':gt 'city_redlight', 'start'
 	elseif pcs_apprnc < 100:
 		'"Look at you, no one will pay for such a product, get cleaned up and come back."'
 
-		act 'Leave':gt 'city_industrial', 'redlight'
+		act 'Leave':gt 'city_redlight', 'start'
 	else
 		'"You can work tonight, head to your room and get ready."'
 
@@ -44,7 +44,7 @@ if $ARGS[0] = 'brothel':
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
-			gt 'city_industrial', 'redlight'
+			gt 'city_redlight', 'start'
 		else
 			cla
 			'You can''t go outside naked.'

+ 7 - 7
locations/bordelv.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'end':
 				act 'Leave':
 					npc_rel['A220'] = 0
 					vikaend = 1
-					gt 'city_industrial', 'redlight'
+					gt 'city_redlight', 'start'
 				end
 				
 				gs 'willpower', 'misc', 'self'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'end':
 						gs 'willpower', 'pay', 'self'
 						gs 'stat'
 						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because this came as a shock. Vika nears you, and you hug her. Soon after, she stops crying and says that she should get back to work, and walks you to the exit.'
-						act 'Leave':gt 'city_industrial', 'redlight'
+						act 'Leave':gt 'city_redlight', 'start'
 					end
 				else
 					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -123,7 +123,7 @@ if $ARGS[0] = 'end':
 					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
 					'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-					act 'Leave':gt 'city_industrial', 'redlight'
+					act 'Leave':gt 'city_redlight', 'start'
 				end
 			else
 				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'end':
 				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
 				'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-				act 'Leave':gt 'city_industrial', 'redlight'
+				act 'Leave':gt 'city_redlight', 'start'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'end':
 					'"That was so hot! Can you talk to your boss? I want to work here," you ask.'
 					'Vika lets out a relieved sigh. "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave," Vika says and leads you to the exit.'
 
-					act 'Leave':gt 'city_industrial', 'redlight'
+					act 'Leave':gt 'city_redlight', 'start'
 				end
 			else
 				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -178,7 +178,7 @@ if $ARGS[0] = 'out':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		gt 'city_industrial', 'redlight'
+		gt 'city_redlight', 'start'
 	end
 	
 	gs 'willpower', 'misc', 'self', 'hard'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'out':
 			gs 'arousal', 'end'
 			gs 'stat'
 			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you, and you hug each other. Shortly thereafter, she stops crying and says that she should get back to work, as she walks you to the exit.'
-			act 'Leave':gt 'city_industrial', 'redlight'
+			act 'Leave':gt 'city_redlight', 'start'
 		end
 	else
 		act 'Comfort her (<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/carF.qsrc

@@ -23,7 +23,7 @@ $enddrive = {
 	if cardrive = 24:gt 'pav_commercial'
 	if cardrive = 25:gt 'city_island'
 	if cardrive = 26:gt 'pav_industrial'
-	if cardrive = 27:gt 'city_industrial', 'redlight'
+	if cardrive = 27:gt 'city_redlight', 'start'
 	if cardrive = 28:gt 'city_suburbs', 'start'
 }
 

+ 1 - 77
locations/city_industrial.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = '':
 	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 'city_industrial', 'redlight'
+	act 'Visit the Red Light District (0:05)': minut += 5 & gt 'city_redlight', 'start'
 
 	act 'Wait':gs 'obj_din', 'wait'
 
@@ -130,82 +130,6 @@ if $ARGS[0] = '':
 	'A long and high fence, which is build around the <a href="exec:gt ''Terminal''">storage terminal</a>'
 end
 
-if $ARGS[0] = 'redlight':
-	$loc_arg = 'redlight'
-	$loc = 'city_industrial'
-	$region = 'city_redlight'
-	$location_type = 'public_outdoors'
-	$menu_loc = 'city_industrial'
-	$menu_arg = 'redlight'
-	menu_off = 0
-	CLOSE ALL
-	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/street7.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/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
-			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
-		end
-	end
-
-	gs 'stat'
-	'<center><h2>St. Petersburg</h2></center>'
-	'<center><b>Red Light District</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
-	
-	'This small area inside the Industrial District has lots of strip clubs and sex shops. The Porn studio also operates out of this district.'
-	if hour >= 18 or hour < 2:
-		'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
-	else
-		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'
-	end
-	if pornstudio >= 1 and hour >= 10 and hour < 22:
-		'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of adult movies are created.'
-	elseif pornstudio >= 1 and (hour < 10 or hour >= 22):
-		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of adult movies are created.'
-	end
-	if hour < 3 or hour >= 11: 
-		'A shop for <a href="exec:minut += 5 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city to browse its stock.'
-	else
-		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
-	end
-	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
-	if hour >= 10: 
-		'You see a small <a href="exec:gt ''etoexhib'',''pos54''">printing shop</a> tucked away between two larger buildings.'
-	end
-
-	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
-
-	act 'Wait':gs 'obj_din', 'wait'
-	
-	gs 'taxi'
-
-	if car > 0:
-		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
-			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
-			cardrive = 3
-		end
-		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
-			'In the parking stands your <a href="exec:' + iif(cardrive = 27, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
-		end
-	end
-
-	if hour >= 20 or hour <= 4:
-		*nl
-		'There are prostitutes working in places near here.'
-		if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
-			act 'Prostitute yourself': gt 'street_walker', 'work'
-		elseif pcs_inhib >= 40:  
-			*nl
-			'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
-		else
-			*nl
-			'You could work as a prostitute, but you aren''t comfortable with the idea.'
-		end
-	end
-end
-
 
 --- city_industrial ---------------------------------
 

+ 81 - 0
locations/city_redlight.qsrc

@@ -0,0 +1,81 @@
+# city_redlight
+
+
+if $ARGS[0] = 'start':
+	$loc_arg = 'start'
+	$loc = 'city_redlight'
+	$region = 'city_redlight'
+	$location_type = 'public_outdoors'
+	$menu_loc = 'city_redlight'
+	$menu_arg = 'start'
+	menu_off = 0
+	CLOSE ALL
+	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/street7.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/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		end
+	end
+
+	gs 'stat'
+	'<center><h2>St. Petersburg</h2></center>'
+	'<center><b>Red Light District</b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
+	
+	'This small area inside the Industrial District has lots of strip clubs and sex shops. The Porn studio also operates out of this district.'
+	if hour >= 18 or hour < 2:
+		'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
+	else
+		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'
+	end
+	if pornstudio >= 1 and hour >= 10 and hour < 22:
+		'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of adult movies are created.'
+	elseif pornstudio >= 1 and (hour < 10 or hour >= 22):
+		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of adult movies are created.'
+	end
+	if hour < 3 or hour >= 11: 
+		'A shop for <a href="exec:minut += 5 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city to browse its stock.'
+	else
+		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
+	end
+	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
+	if hour >= 10: 
+		'You see a small <a href="exec:gt ''etoexhib'',''pos54''">printing shop</a> tucked away between two larger buildings.'
+	end
+
+	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
+
+	act 'Wait':gs 'obj_din', 'wait'
+	
+	gs 'taxi'
+
+	if car > 0:
+		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
+			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
+			cardrive = 3
+		end
+		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
+			'In the parking stands your <a href="exec:' + iif(cardrive = 27, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+		end
+	end
+
+	if hour >= 20 or hour <= 4:
+		*nl
+		'There are prostitutes working in places near here.'
+		if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
+			act 'Prostitute yourself': gt 'street_walker', 'work'
+		elseif pcs_inhib >= 40:  
+			*nl
+			'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
+		else
+			*nl
+			'You could work as a prostitute, but you aren''t comfortable with the idea.'
+		end
+	end
+end
+
+--- city_residential ---------------------------------
+

+ 3 - 3
locations/etoexhib.qsrc

@@ -1695,7 +1695,7 @@ if $ARGS[0] = 'pos54':
 		'He tells you "A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>"'
 	end
 
-	act 'Leave': gt 'city_industrial', 'redlight'
+	act 'Leave': gt 'city_redlight', 'start'
 
 	if age < 18 and fakepassport ! 1:
 		if money => 30000:
@@ -1708,7 +1708,7 @@ if $ARGS[0] = 'pos54':
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 				'He tells you to come in the back and takes a quick photo of your face, then tells you to wait out out front until he''s done. About an hour goes by before he steps back out and hands you the passport, which shows your face but has an older age printed out on it.'
 
-				act 'Leave': gt 'city_industrial', 'redlight'
+				act 'Leave': gt 'city_redlight', 'start'
 			end
 		else
 			act 'Buy fake passport (<font color="red">30,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake passport.</font>'
@@ -1726,7 +1726,7 @@ if $ARGS[0] = 'pos54':
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 				'You bought a fake diploma.'
 
-				act 'Leave': gt 'city_industrial', 'redlight'
+				act 'Leave': gt 'city_redlight', 'start'
 			end
 		else
 			act 'Buy fake diploma (<font color="red">100,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake diploma.</font>'

+ 4 - 4
locations/pornstudio.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/studio_porn/studia_0.jpg"></center>'
 
-	act 'Leave': gt 'city_industrial', 'redlight'
+	act 'Leave': gt 'city_redlight', 'start'
 
 	if hour < 10 or hour > 22:
 		'The porn studio is currently closed. It is open between 10:00 and 22:00.'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'start':
 				'As you leave the studio, you hear someone exit a nearby building and start following you.'
 				'<font color="magenta"> "Just avoid dark, deserted places and this will blow over."</font> you reassure yourself, and carry on.'
 
-				act 'Leave': gt 'city_industrial', 'redlight'
+				act 'Leave': gt 'city_redlight', 'start'
 			end
 		elseif workDisk = 3 and week = 5:
 			act 'Give the envelope':
@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 					'You give the envelope to the manager and he gives you 5,000 <b>₽</b>.'
 				end
 
-				act 'Leave': gt 'city_industrial', 'redlight'
+				act 'Leave': gt 'city_redlight', 'start'
 			end
 		end
 	end
@@ -249,7 +249,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 the 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 'Disagree':bomzQW = -1 & gt 'city_industrial', 'redlight'
+	act 'Disagree':bomzQW = -1 & gt 'city_redlight', 'start'
 
 	act 'Agree':
 		cls

+ 6 - 6
locations/sexshop.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	*nl
 	'Private booths are available in the basement for viewing porn. (50 <b>₽</b> for 15 minutes)'
 
-	act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
+	act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 
 	if analplug = 1 and dildo = 1 and hotcat >= 5 and Peter = 0:
 		if rand(0,1) = 1:
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/peter.jpg"></center>'
 				'You approach the counter and introduce yourself. "Hey there, I''m <<$pcs_nickname>>."'
 				'"I''m Peter," he replies. "I''ve been watching you for a while and I find you rather...interesting. Do you want to come back to my place for some ''fun''?"'
-                act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
+                act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 				act 'Go with him': gt 'Peterroom', 'start'
 			end
 		end
@@ -986,7 +986,7 @@ if $ARGS[0] = 'kendra':
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend.jpg"></center>'
 			'You smile at her. "Sorry, no. I still don''t belong to anyone."'
 			'She sighs softly. "Such a waste. Oh well, there''s plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again and you''ll change your mind. I go to the University, so you should stop by sometime." She gives you directions to her dorm room before she returns to browsing.'
-			act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
+			act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 			act 'Go back to shopping':gt 'sexshop', 'start'
 		end
 		act 'Yes':
@@ -1022,7 +1022,7 @@ if $ARGS[0] = 'kendra':
 				gs 'stat'
 				minut += 5
 				'You quickly leave while Kendra can''t stop you.'
-				gt 'city_industrial', 'redlight'
+				gt 'city_redlight', '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>'
@@ -1048,7 +1048,7 @@ if $ARGS[0] = 'kendra':
 		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says with confidence.'
 		'"Oh..." you reply. She''s one of those people.'
-		act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
+		act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 		act 'Go back to shopping':gt 'sexshop', 'start'
 		act 'Talk to her':
 			*clr & cla
@@ -1093,7 +1093,7 @@ if $ARGS[0] = 'kendra':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend0.jpg"></center>'
 		'As you browse the store, you see a very attractive young black woman trying on latex clothes. She notices you and gives you a quick once over before she goes back to what she was doing. After a few minutes, she moves to another section of the store.'
-		act 'Leave': minut += 5 & gt 'city_industrial', 'redlight'
+		act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 		act 'Go back to shopping':gt 'sexshop', 'start'
 	end
 end

+ 1 - 1
locations/street_walker.qsrc

@@ -796,7 +796,7 @@ if $ARGS[0] = 'end':
 	if prst_loc = 0:
 		gt 'city_center'
 	elseif prst_loc = 1:
-		gt 'city_industrial', 'redlight'
+		gt 'city_redlight', 'start'
 	else
 		gt 'city_residential'
 	end

+ 2 - 2
locations/stripclub.qsrc

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