Răsfoiți Sursa

[fixed] photo studio stuff
[changed] Mari conversations

hornguy6 6 ani în urmă
părinte
comite
21cae6c357
3 a modificat fișierele cu 165 adăugiri și 166 ștergeri
  1. 98 125
      locations/foto.qsrc
  2. 3 3
      locations/foto_events.qsrc
  3. 64 38
      locations/foto_models.qsrc

+ 98 - 125
locations/foto.qsrc

@@ -378,12 +378,12 @@ if $ARGS[0] = 'studio':
 		if first_fame_event = 2:
 			act'Ask if there''s special work available':gt'foto_events','special'
 		end
-		if model = 1:act 'Go to the showers':gt'foto','showers'
-		if model = 1:act 'Go to your makeup station':gt'foto','makeup'
 	else
 		*nl
 		'	There is no way anyone is going to want to see pictures of you while your std is so obvious, you should see a doctor.'
 	end
+	if model = 1:act 'Go to the showers':gt'foto','showers'
+	if model = 1:act 'Go to your makeup station':gt'foto','makeup'
 end
 
 if $ARGS[0] = 'gave_passport':
@@ -405,98 +405,100 @@ end
 if $ARGS[0] = 'interview':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-	if howoldareyou = 0:
-		'	"You want to work here? How old are you?"'
-		if age >= 18:
-			howoldareyou = 2
-			'	I''m <<age>>.'
-			'	"I see. Alright, undress. Let me take a look at you."'
-		elseif fakepassport = 1:
+	'	"You want to work here? How old are you?"'
+	if age >= 18:
+		act'I''m <<age>>':
 			howoldareyou = 2
-			'	"I''m 18."'
-			'	"I see. Alright, undress. Let me take a look at you."'
-		else
-			act 'Tell the truth':
-				age_truth = 1
-				howoldareyou = 1
-				cla
-				gs'foto','interview'
-			end
-			act 'Lie':
-				age_lie = 1
-				howoldareyou = 1
-				cla
-				gs'foto','interview'
-			end
+			gt'foto','interview2'
 		end
-	elseif howoldareyou > 0:
-		if howoldareyou = 1:
-			howoldareyou = 2
-			if age_truth = 1 or age >= 18:
-				'	"I''m <<age>>."'
-				'	"I see. Alright, undress. Let me take a look at you."'
-			elseif fakepassport = 1:
-				'	"I''m 18."'
-				'	"I see. Alright, undress. Let me take a look at you."'
-			end
+	elseif fakepassport = 1:
+		act'I''m 18':gt'foto','interview2'
+	else
+		act 'Tell the truth':
+			age_truth = 1
+			howoldareyou = 1
+			gt'foto','interview2'
 		end
-		if undress_ask = 0:
-			act'What? Why?':
-				undress_ask = 1
-				*clr
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-				'	"What?? Why?"'
-				'	"Hmm? This is a modelling studio. That means sometimes we dress our models up in skimpy clothes and lingerie. Our studio is also popular for its nude spreads. You don''t necessarily need to do shoots with nudity, but you need to have your body inspected to make sure you match the criteria for working here."'
-			end
+		act 'Lie':
+			age_lie = 1
+			howoldareyou = 1
+			gt'foto','interview2'
 		end
-		if why_here = 0:
-			act'Right here?':
-				why_here = 1
-				*clr
-				gs'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-				'	"Right here?" you ask. "Shouldn''t we be doing this in some kind of interview room or something?"'
-				'	"Might as well be here," he shrugs. "If you want to work here, we have a dress code policy for the models."'
-				'	"So? What does that have to do with me getting naked in the middle of a workplace?"'
-				'	"The policy is that models don''t wear clothes while on the premises. It makes the logistics of dressing and undressing them for shoots easier. Come on. You want to work for a modelling studio that specializes in nude spreads. Don''t get shy about showing your body to a few people here when you might be on a magazine cover showing it to the entire country. Now are you going to undress so I can do my job or are you going to keep wasting my time here?"'
-			end
+	end
+end
+	
+if $ARGS[0] = 'interview2':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+	if age_truth = 1 or age >= 18:
+		*nl
+		'	"I''m <<age>>."'
+		'	"I see. Alright, undress. Let me take a look at you."'
+	elseif fakepassport = 1 or age_lie = 1:
+		*nl
+		'	"I''m 18."'
+		'	"I see. Alright, undress. Let me take a look at you."'
+	end
+	if undress_ask = 0:
+		act'What? Why?':
+			undress_ask = 1
+			*clr
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'	"What?? Why?"'
+			'	"Hmm? This is a modelling studio. That means sometimes we dress our models up in skimpy clothes and lingerie. Our studio is also popular for its nude spreads. You don''t necessarily need to do shoots with nudity, but you need to have your body inspected to make sure you match the criteria for working here."'
 		end
-		if pcs_inhib >= 40:
-			act 'Do as he says':
-				*clr & cla
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
+	end
+	if why_here = 0:
+		act'Right here?':
+			why_here = 1
+			*clr
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'	"Right here?" you ask. "Shouldn''t we be doing this in some kind of interview room or something?"'
+			'	"Might as well be here," he shrugs. "If you want to work here, we have a dress code policy for the models."'
+			'	"So? What does that have to do with me getting naked in the middle of a workplace?"'
+			'	"The policy is that models don''t wear clothes while on the premises. It makes the logistics of dressing and undressing them for shoots easier. Come on. You want to work for a modelling studio that specializes in nude spreads. Don''t get shy about showing your body to a few people here when you might be on a magazine cover showing it to the entire country. Now are you going to undress so I can do my job or are you going to keep wasting my time here?"'
+		end
+	end
+	if pcs_inhib >= 40:
+		act 'Do as he says':
+			*clr & cla
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
+			if undress_ask = 0 and why_here = 0:
+				'	You unquestioningly take off your clothes and leave them on the floor while the photographer examines you.'
+			else
 				'	You take off your clothes and leave them on the floor while the photographer examines you.'
-				'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
-				'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
-				act'Continue':gt'foto','job_offer'
-			end
-		elseif pcs_inhib >= 15:
-			act'Reluctantly undress':
-				reluctant_undress = 1
-				*clr & cla
-				gs 'clothing', 'strip'
-				gs 'underwear', 'remove'
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
-				'	You take a deep breath and begin to take off your clothes. As long as it''s just this one time, you can handle it for now. You leave them on the floor while the photographer examines you.'
-				!if pcs_inhib <= 20'	You instinctively cover up as he steps closer, your hands trying to shield your nipples and pussy.'
-				'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
-				'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
-				'	<i>This is so embarrassing!</i>'
-				act'Continue':gt'foto','job_offer'
 			end
+			'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
+			'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
+			act'Continue':gt'foto','job_offer'
 		end
-		act'I can''t do it':
+	elseif pcs_inhib >= 15:
+		act'Reluctantly undress':
+			reluctant_undress = 1
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-			'	Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
-			act 'Leave': minut += 1 & gt 'down'
+			gs 'clothing', 'strip'
+			gs 'underwear', 'remove'
+			gs 'stat'
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"></video><video autoplay loop src="images/locations/city/citycenter/photo/strip2.mp4"></video></center>'
+			'	You take a deep breath and begin to take off your clothes. As long as it''s just this one time, you can handle it for now. You leave them on the floor while the photographer examines you.'
+			!if pcs_inhib <= 20'	You instinctively cover up as he steps closer, your hands trying to shield your nipples and pussy.'
+			'	He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$vaginatipe>> pussy...'
+			'	He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
+			'	<i>This is so embarrassing!</i>'
+			act'Continue':gt'foto','job_offer'
 		end
 	end
+	act'I can''t do it':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+		'	Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
+		act 'Leave': minut += 1 & gt 'down'
+	end
 end
 
 
@@ -936,7 +938,7 @@ if $ARGS[0] = 'practicemodel':
 	'	"Hello <<$pcs_firstname>>. We''ve already done a paid shoot with you this week, so we can''t do another one. '
 	'	But would you like to get some practice in?"'
 	act '"Maybe not today"' :gt 'foto','studio'
-	act '"Yes, please."':
+	act '"Yes, please"':
 		cla
 		'	"What kind of shoot would you like to do today? With nudity or without?"'
 		*nl
@@ -962,7 +964,7 @@ if $ARGS[0] = 'practicemodel':
 					if fashionshoot < 5:'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
 					if fashionshoot = 5:
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion4.mp4"></video></center>'
-						'	You spend the next two hours putting on various dresses, practicing modelling for the online catalogs of retail clothing stores. Apparently for consistency they want you to have the exact same expression on your face every time, so you spend most of the time practicing that.'
+						'	You spend two hours putting on various dresses, practicing modelling for the online catalogs of retail clothing stores. Apparently for consistency they want you to have the exact same expression on your face every time, so you spend most of the time practicing that.'
 					end
 					if pcs_mdlng < 20:
 						act'Continue':
@@ -1394,7 +1396,7 @@ if $ARGS[0] = 'practicemodel':
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/model4.mp4"></video></center>'
 						'	A topless shoot without even a bikini or a loose shirt to hide your breasts... Unthinkable that you could ever do it for real! But it''s only a practice shoot right now. You''re not comfortable with it, but if you want to grow as a model, this is what you have to do.'
 						*nl
-						'	You put on the bottoms the photographer chose for you and omit a top leaving your breasts exposed. You spend the next two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
+						'	You put on the bottoms the photographer chose for you and omit a top leaving your breasts exposed. You spend two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
 						if pcs_inhib < 20:
 							act'Continue':
 								cla
@@ -1431,7 +1433,7 @@ if $ARGS[0] = 'practicemodel':
 						inhib_exp += 3
 						gs 'stat'
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/model4.mp4"></video></center>'
-						'	You put on the bottoms the photographer chose for you and omit a top leaving your breasts exposed. You spend the next two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
+						'	You put on the bottoms the photographer chose for you and omit a top leaving your breasts exposed. You spend two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
 						if pcs_mdlng < 20:
 							act'Continue':
 								cla
@@ -1462,38 +1464,9 @@ if $ARGS[0] = 'practicemodel':
 				end
 			end
 			
-			
-			
-				
-					cla
-					act 'Not for me':gt 'foto','studio'
-
-					act 'Agree (2:00)':
-						*clr & cla
-						minut += 120
-						modelpayfin = 0
-						mdlng_exp += rand(8,10)
-						inhib_exp += 4
-						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
-						'	You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
-						*nl
-						'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-						*nl
-						if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
-						if pcs_mdlng >= 40 and commercial = 0:
-							act 'Leave':gt'foto','commercial'
-						else
-							act 'Leave':gt 'foto', 'end'
-						end
-					end
-				end
-			end
-			
 			act 'Transparent Lingerie':
 				cla
 				act 'Not for me':gt 'foto','studio'
-
 				if pcs_inhib < 55:
 					act 'Practice (2:00)':
 						*clr & cla
@@ -1807,12 +1780,12 @@ if $ARGS[0] = 'model':
 				pav_modelling += rand(1,city_modelling)/10
 				fashionshoot = rand(1,5)
 				gs 'stat'
-				if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2>>.mp4"></video></center>'
+				if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
 				if fashionshoot >= 3 and fashionshoot < 5:'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,3)>>.jpg"></center>'
 				if fashionshoot < 5:'	You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
 				if fashionshoot = 5:
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
-					'	You spend the next two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
+					'	You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
 				end
 				*nl
 				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
@@ -2022,7 +1995,7 @@ if $ARGS[0] = 'nude_shoot':
 				inhib_exp += 3
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/model4.mp4"></video></center>'
-				'	You put on some pants and omit a top leaving your breasts exposed. You spend the next two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
+				'	You put on some pants and omit a top leaving your breasts exposed. You spend two hours striking various poses, covering and uncovering your breasts, and listen to instruction while the photographer takes pictures of you.'
 				*nl
 				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
 				if pcs_mdlng >= 40 and commercial = 0:
@@ -2086,7 +2059,7 @@ if $ARGS[0] = 'nude_shoot':
 				city_modelling += rand(10,20)
 				pav_modelling += rand(0,city_modelling)/4
 				inhib_exp += 5
-				shoot_type rand(1,3)
+				shoot_type = rand(1,3)
 				gs 'stat'
 				if shoot_type = 1:
 					modelfoto_pussy += 1
@@ -2095,26 +2068,26 @@ if $ARGS[0] = 'nude_shoot':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,3)>>.jpg"></center>'
 						'	Already naked, you step onto set and begin the shoot immediately.'
 						*nl
-						'	You spend the next two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+						'	You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(13,15)>>.jpg"></center>'
 						'	Already naked, you step onto set and begin the shoot immediately.'
 						*nl
-						'	You spend the next two hours posing confidently for a photographer taking pictures of you, your thick bush being used as a simple censor of your pussy and make it more "acceptable" as art while still maintaining the feeling of eroticism. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+						'	You spend two hours posing confidently for a photographer taking pictures of you, your thick bush being used as a simple censor of your pussy and make it more "acceptable" as art while still maintaining the feeling of eroticism. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 					end
 				elseif shoot_type = 2:
 					modelfoto_nip += 1
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(4,11)>>.jpg"></center>'
 					'	Already naked, you step onto set and begin the shoot immediately.'
 					*nl
-					'	You spend the next two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully shields your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+					'	You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully shields your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 				else
 					city_modelling += rand(0,5)
 					pav_modelling += rand(0,2)
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude12.jpg"></center>'
 					'	Already naked, you step onto set and begin the shoot immediately.'
 					*nl
-					'	You spend the next two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+					'	You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
 				end
 				*nl
 				if pornstudio = 0:pornstudio = 2 & '	At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
@@ -2151,7 +2124,7 @@ if $ARGS[0] = 'nude_shoot':
 				modelfoto_pussy += 1
 				gs 'stat'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
-				'	You spend the next two hours posing for the photographer, changing in and out of various underwears, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
+				'	You spend two hours posing for the photographer, changing in and out of various underwears, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
 				*nl
 				'	After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
 				if pcs_mdlng >= 40 and commercial = 0:

+ 3 - 3
locations/foto_events.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'high_fasion':
 			mdlng_exp += rand(1,2)
 			city_modelling += rand(5,25)
 			pav_modelling += rand(0,city_modelling)/6
-			exhibition_exp += rand(0,1)
+			pcs_exhib += rand(0,1)
 			money += modelpayfin
 			modelfotomoney += modelpayfin
 			'	You spend the duration of the shoot changing in and out of designer bodices, corsets, and other tops, all of which conspicuously lack any kind of bottom, leaving your pussy exposed.'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'modern_art':
 				modelfoto_nude += 1
 				mdlng_exp += rand(9,10)
 				city_modelling += rand(1,21)
-				exhibition_exp += 5
+				pcs_exhib += 5
 				modern_art_projet = 1
 				pcs_horny += 20
 				'	The girl has you and the other model lie down on your sides and then wrap your legs your heads, both of you grabbing the other''s foot with your hand in a way that allows you to perfectly mirror each other''s position. At the client''s insistence, you bury your face between between the other girl''s legs. The aroma of her sex fills your nostrils and you can feel her breath on your own pussy as well.'
@@ -1325,7 +1325,7 @@ if $ARGS[0] = 'wet':
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4
-							exhibition_exp += 5
+							pcs_exhib += 5
 							money += modelpayfin
 							modelfotomoney += modelpayfin
 							'	Eventually, the shoot is over and they leave you cold, shivering, and with really hard nipples. But at least you''ve also got a dry wad of cash that counts out to <<modelpayfin>> <b>₽</b>.'

+ 64 - 38
locations/foto_models.qsrc

@@ -419,6 +419,11 @@ if $ARGS[0] = 'mari_chat':
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
 			'	"Hey Mari, how come you don''t shave your bush?"'
 			'	"The photographers actually ask me not to shave. They say it helps sell my ''farm girl'' look," she says, causing you both to giggle a little. "Besides, I tried shaving once when I still lived in Gadyukino and I hated that prickly feeling when it would start to grow back as stubble. It''s too much of a hassle to keep it smooth down there so since then I just decided to keep it trimmed."'
+			if pubestyle = 2:
+				'	"I know what you mean! Keeping it clean-shaven is too much work. What''s wrong with having a bit of bush?"'
+				'	"Right???"'
+				'	The two of you laugh together over your agreement in pubic hair fashion.'
+			end
 			act 'Keep chatting':gt 'foto_models','mari_chat'
 		end
 
@@ -458,56 +463,52 @@ if $ARGS[0] = 'mari_chat':
 					'	"Ugh! Everything! He''s an annoying little brat! He just spends all his time playing football with his friends and if I''m around he''ll scream at me until I go away. He''s always asking me to do his homework for him and worst of all he''s always trying to spy on me in the shower!"'
 					'	"What? You don''t have a latch or something to stop him?"'
 					'	You blush. "Uh, yeah I do, but I, uh, forget to lock it sometimes..."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 20 and npc_rel['A34'] < 40:
+				elseif npc_rel['A34'] < 40:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my annoying little brother."'
 					'	Mari sits up a bit. "Really? What''s so irritating about him?"'
 					'	"Oh, nothing much. Just sibling squabbles. He''s not all that bad, just gets on my nerves sometimes."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 40 and npc_rel['A34'] < 60:
+				elseif npc_rel['A34'] < 60:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my little brother."'
 					'	"That sounds nice. What are they like?"'
 					'	"Well to be honest, my sister can be a bit of a slut, but she''s still the best one I could ask for. My brother loves playing football so sometimes I join him and his friends at the field."'
 					'	"Maybe I''ll get to meet them one day!"'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif npc_rel['A34'] >= 60 and npc_rel['A34'] < 80:
+				elseif npc_rel['A34'] < 80:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my silly little brother."'
 					'	Mari smiles at you. "That''s sounds nice."'
 					'	You think of your siblings and smile. "Yeah. It is."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
-
-				elseif npc_rel['A34'] >= 80 and brothersex < 1:
-					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
-					'	Mari smiles at you. "You sound close."'
-					'	You think of your siblings and smile, "Yeah. We are."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
-
-				elseif sisterLesb >= 5 and brotherSex >= 1 and brotherSex < 7 and npc_rel['A34'] >= 80:
+					
+				elseif sisterLesb >= 5:
+                    '    "Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
+                    '    Mari smiles at you. "You sound close."'
+                    '    Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'
+
+                elseif brothersex < 1:
+					'    "Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
+                    '    Mari smiles at you. "You sound close."'
+                    '    You think of your siblings and smile, "Yeah. We are."'
+
+				elseif sisterLesb >= 5 and brotherSex < 7:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'	Mari smiles at you. "You sound close."'
 					'	Your mind wanders back to your siblings and how you''ve fooled around with both of them separately.'
 					'	"You could say that..."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
 
-				elseif sisterLesb >= 5 and brotherSex >= 7 and npc_rel['A34'] >= 80:
+				elseif sisterLesb >= 5:
 					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
 					'	Mari smiles at you. "You sound close."'
 					'	Your mind wanders back to your siblings and how you''ve fooled around with your sister and even had full fledged intercourse with your brother. Your thoughts wander to the memory of the last time his cock was inside you and it causes you to blush.'
 					'	"You could say that..."'
-					act 'Keep chatting':gt 'foto_models','mari_chat'
-
-				elseif sisterLesb >= 5 and npc_rel['A34'] >= 80:
-					'	"Yeah, I''ve got two. My sister who''s about the same age as you are and my adorable little brother. I love them both so much!"'
-					'	Mari smiles at you. "You sound close."'
-					'	Your mind wanders back to your sister and how you sometimes wake her up in the middle of the night to fool around with her. "You could say that..."'
-
-					act 'Keep chatting':gt 'foto_models','mari_chat'
+                else
+                    '    "Yeah, I''ve got two. My sister who''s about the same age as you are and my silly little brother."'
+                    '    Mari smiles at you. "That''s sounds nice."'
+                    '    You think of your siblings and smile. "Yeah. It is."'
 				end
+					act 'Keep chatting':gt 'foto_models','mari_chat'
 			else
-				'	"No, there''s just me.'
+				'	"No, there''s just me."'
 				act 'Keep chatting':gt 'foto_models','mari_chat'
 			end
 		end
@@ -681,7 +682,11 @@ if $ARGS[0] = 'mari_modelling_chat':
 		act'"What''s that?"':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading6.jpg"></center>'
-			'	She stands up and gives you a tight hug. Once again you feel her soft breasts molding into yours and her hot skin rubbing against you. Her hug is so tight that your hips are being pressed together and you can feel her bush between your legs.'
+			if pcs_pubes < 11:
+				'	She stands up and gives you a tight hug. Once again you feel her soft breasts molding into yours and her hot skin rubbing against you. Her hug is so tight that your hips are being pressed together and you can feel her bush between your legs.'
+			else
+				'	She stands up and gives you a tight hug. Once again you feel her soft breasts molding into yours and her hot skin rubbing against you. Her hug is so tight that your hips are being pressed together and you can feel her bush brushing against your own.'
+			end
 			'	Pulling back with a smile she says, "Always make friends with your co-workers. Especially girls. We have to stick together you know!"'
 			'	You can''t help but smile back, saying, "We sure do Mari!"'
 			act'Continue':gt 'foto_models','mari_modelling_chat'
@@ -712,7 +717,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 					'	"So then how <i>did</i> you get hired here?"'
 					'	Mari looks down at her book smiling in a way that looks like she''s slightly embarrassed. "I just... kind of... walked in... I saw some of the albums they have by the entrance, thought, ''Hey, maybe I can do this?'' and asked if I could get hired here."'
 					'	"And they hired you just like that?" you ask.'
-					'	"Well... There were a couple hoops I had to jump through. I wasn''t exactly legal yet, so I had to buy a fake passport that said I was just to get started. But as you can see, it was well worth it!"'
+					'	"Well... There were a couple hoops I had to jump through. Don''t tell anyone but I was 17 at the time so I had to buy a fake passport just to get started. But as you can see, it was well worth it!"'
 					mari_fakepassport = 1
 					act'Keep chatting':gt 'foto_models','mari_modelling_chat'
 				end
@@ -725,11 +730,16 @@ if $ARGS[0] = 'mari_modelling_chat':
 			*clr & cla
 			mari_modelling_ask = 1
 			'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
-			'	"Wait, so how old were you when you started working here?"'
-			if year = 2016:'	"I was 17. I actually only just turned 18 this year."'
-			if year > 2016:'	"I was 17."'
-			'	"And you said you bought a fake passport to work here?"'
-			'	"Yup!"'
+			'	"Wait, you used a fake passport to start working here?"'
+			'	"Yeah."'
+			'	"So how old are you now?'
+			if year = 2016:
+				'	"I''m 18 now, thankfully. My birthday was actually just this last May."'
+			elseif year > 2016 and month > 5:
+				'	"I''m <<2016 - 1998>>. I turned 18 back in 2016."'
+			else
+				'	"I''m <<2016 - 1999>>. I turned 18 back in 2016."'
+			end
 			if age < 18 and fakepassport = 1:
 				act '"Did you buy it from that suspicious guy at the train station?"':
 					*clr & cla
@@ -737,20 +747,36 @@ if $ARGS[0] = 'mari_modelling_chat':
 					'	"Hey, did you buy it from that suspicious guy at the train station?" you ask her.'
 					'	She perks up as you say this.'
 					'	"I did! How did you know? Are you using one now? How old are you?"'
-					act'"I''m <<age>>."':
+					act'Tell her shyly':
 						cla
+						*nl
 						'	"I''m <<age>>... You''re not going to tell anyone are you?"'
-						'	"How could I? You basically did the same thing I did. Besides, girls like us have to stick together you know!"'
+						'	"Are you kidding? How could I? You basically did the same thing I did. We''d both get in trouble!" she laughs.'
 						act '"Hey..."':
 							*clr & cla
 							'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading6.jpg"></center>'
-							'	"Hey... this reminds me for some reason... The guy who auditioned you... Did he also make you strip down before telling you how old you needed to be to work here?"'
+							'	"Hey... this reminds me for some reason... The guy who interviewed you... Did he also make you strip down before telling you how old you needed to be to work here?"'
 							'	Mari jumps up out of her seat to finish your sentence, "And then told you that he liked your naked body so you should go to the train station and buy a fake passport??"'
 							'	"Yeah he did!" you cry out. "What a perv! Going out of his way to make excuses to take pictures of underage girls like us!"'
 							'	You laugh about it together and then try to quiet down a bit, remembering you should probably not spread it around that you''re only <<age>>...'
 							act'Keep chatting':gt 'foto_models','mari_modelling_chat'
 						end
 					end
+					act'Tell her excitedly':
+						*clr & cla
+						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading6.jpg"></center>'
+						'	"I''m <<age>>!"'
+						'	"What??" she cries, jumping up excitedly. "That''s crazy!"'
+						'	"I know right? What are the odds that two girls like us from outside the city would both buy fake passports to end up here?"'
+						'	"You said you visit your grandparents in Gadyukino sometimes right? Maybe it''s something in the water!" she laughs.'
+						'	You laugh with her for a moment before the both of you calm down again.'
+						'	"Hey... this reminds me for some reason... The guy who auditioned you... Did he also make you strip down before telling you how old you needed to be to work here?"'
+						'	"And then told you that he liked your naked body so you should go to the train station and buy a fake passport??"'
+						'	"Yeah he did! What a perv! Going out of his way to make excuses to take pictures of underage girls like us!"'
+						'	You both burst into fits of laughter before clapping your hands over your mouths and trying to stifle your hysterics. You probably shouldn''t spread it around that you''re only <<age>>...'
+						act'Keep chatting':gt 'foto_models','mari_modelling_chat'
+						end
+					end
 				end
 			end
 
@@ -782,7 +808,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 					act '"I''m <<age>>, I never used a fake passport."':
 						*clr & cla
 						'<center><img src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading3.jpg"></center>'
-						'	"Oh no, I''ve never bought a fake passport. I''m <<age>> and I''ve always been legal to work here, I just know about the guy. It was where the Gopniks in my school would go to get their fakes so they could buy booze," you say with a laugh.'
+						'	"Oh no, I''ve never bought a fake passport. I''m <<age>> and I''ve always been working here legally, I just know about the guy. It was where the Gopniks in my school would go to get their fakes so they could buy booze," you say with a laugh.'
 						'	"Oh! I didn''t realize he was that well known."'
 						act'Continue':
 							*clr & cla
@@ -1477,7 +1503,7 @@ if $ARGS[0] = 'krystal_chat':
 						'	Suddenly you realize Krystal is giving you a weird look.'
 						'	"W-What...?" you stammer. "Is there something on my face?"'
 						'	"No..." she says while eyeing you up. "I just wanted you to know that if you ever want to do some uhh... ''fat burning exercises'' with me and Ben... you''re more than welcome to join us." She gives you another smirk as she bites her lip.'
-						if pcs_exhibition < 50:
+						if pcs_inhib < 50:
 							'	You break eye contact with her and look away, blushing furiously and try to mumble some kind of response. "I... uhh... ummm... yeah..."'
 							'	<i>What the hell am I even supposed to say to that?</i> you think to yourself.'
 							act'Keep chatting':gt'foto_models','krystal_chat'