Merge remote-tracking branch 'hornguy6/master'

locations/foto.qsrc

@@ -145,7 +145,7 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model < min(city_modelling, 700) and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
+	if special_model < min(city_modelling, 700) and modelfoto_topless > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
 	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
 
 	minut += 5
@@ -1104,10 +1104,10 @@ if $ARGS[0] = 'makeup':
 	if pcs_hairbsh = 0 or pcs_makeup = 1:
 		act'Do your own makeup': menu_off = 1 & gt'mirror','start'
 
-		act'Go to the makeup artists (1:00)':
+		act'Go to the makeup artists (0:30)':
 			cla & *clr
 			menu_off = 1
-			minut += 60
+			minut += 30
 			pcs_hairbsh = 1
 			pcs_makeup = 5
 			pcs_lipbalm += 8

locations/foto_events.qsrc

@@ -500,7 +500,7 @@ if $ARGS[0] = 'glamour_persuasion':
 	elseif foto_persuade = 1:
 		'"We can do a lingerie shoot today if you like, but the studio would still really love to see you do that glamour shoot. What do you say?"'
 	elseif foto_persuade = 2:
-		'"Hey <<$pcs_firstname>>, the staff have been talking again. You want to try upgrading shoots again? We were wondering if you''d consider trying a glamour shoot today?"'
+		'"Hey <<$pcs_firstname>>, the staff have been talking again. We love your lingerie stuff but we were wondering if you''d consider trying a glamour shoot today?"'
 	elseif foto_persuade = 3:
 		'"Hey I''m sorry to bother you like this again, but we would still really love to see you do that glamour shoot. What do you say? Willing to give it a try today?"'
 	end
@@ -584,7 +584,7 @@ if $ARGS[0] = 'glamour_persuasion':
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 						'"That''s not so bad I guess... I''m already doing lingerie so that''s not much of a difference."'
 						'"Yes, exactly! Think of it just like that. Thanks for this <<$pcs_firstname>>. Just go to this set and we''ll set somebody up for you."'
-						act'Do the glamour shoot':gt'foto_shoot','skimpy_clo'
+						act'Do the glamour shoot':gt'foto_shoot','sexy'
 					end
 				end
 			else
@@ -647,7 +647,7 @@ if $ARGS[0] = 'trans_persuasion':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Thanks for the offer, but I think I''ll stick to the basic glamour shoot today."'
 			'"Oh. Okay..."'
-			act'Do the glamour shoot':gt'foto_shoot','skimpy_clo'
+			act'Do the glamour shoot':gt'foto_shoot','sexy'
 		end
 	else
 		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -664,6 +664,16 @@ if $ARGS[0] = 'trans_persuasion':
 			act'Do the transparent shoot':gt'foto_shoot','transparent'
 		end
 	elseif foto_persuade = 1 or foto_persuade = 4:
+		act'I guess I could try':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... I guess I could give it a try..."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the transparent shoot':gt'foto_shoot','transparent'
+		end
+		
 		act'Yes, I''m ready':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'

locations/foto_shoot.qsrc

@@ -21,7 +21,9 @@ if $ARGS[0] = 'model':
 	'<b>Erotic</b> - An erotic shoot makes no excuses about its purpose. The intent is to capture sexual images of female bodies to sell to pornography sites and erotic magazines. This type of modelling will have the highest bonuses based on your appearance but will also increase your fame in the porn industry as well.'
 	*p '</table></center>'
 	act'Never mind':
-		cla
+		cla & *clr
+		'<center><b><font color="maroon">Manager</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
 		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
 		act'Leave':gt 'foto','studio'
@@ -37,30 +39,39 @@ if $ARGS[0] = 'model':
 		
 		act'Clothing':
 			shoot_type = catalog
+			modelfoto += 1
 			modelfoto_catalog += 1
 			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
 			money += 450
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
-			'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.'
+			modelfotomoney += 450
+			if rand(1,2) = 1:
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/1.mp4"></video></center>'
+				'You spend two hours modelling various tights with tops for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
+			else
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/catalog/2.mp4"></video></center>'
+				'You spend two hours modelling various dresses for the online catalogs of retail clothing stores. You change clothes probably 30 times over the shoot, but always wear the same expression. It''s boring but it still gets you paid.'
+			end
 			*nl
 			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
+			act 'Leave':gt 'foto', 'studio'
 		end
 		act'Swimsuits':
 			shoot_type = swim_catalog
+			modelfoto += 1
 			modelfoto_catalog += 1
 			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
 			money += 450
+			modelfotomoney += 450
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
 			bikinicatalog += 1
 			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
 			*nl
 			'You recieve 450 <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
+			act 'Leave':gt 'foto', 'studio'
 		end
 	end
 	
@@ -139,7 +150,7 @@ if $ARGS[0] = 'model':
 	end
 
 	act'"I''d like to do a glamour shoot"':
-		if pcs_inhib < 30:
+		if pcs_inhib < 30 and modelfoto_glamour < 1:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 		else
 			gt'foto_shoot', 'glamour_shoot'
@@ -147,7 +158,7 @@ if $ARGS[0] = 'model':
 	end
 	
 	act'"I''d like to do a nude shoot"':
-		if pcs_inhib < 30:
+		if pcs_inhib < 30 and modelfoto_nude < 1:
 			msg'You toy with the idea of exposing yourself on camera but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'
 		else
 			gt'foto_shoot', 'nude_shoot'
@@ -607,7 +618,6 @@ if $ARGS[0] = 'trans_ling':
 	*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_events','commercial'
 	else
@@ -646,6 +656,7 @@ if $ARGS[0] = 'tasteful':
 	modelpay = (pcs_mdlng/2 * 10) + min(city_modelling, 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto_tastenude += 1
+	modelfoto_nude += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 40: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', rand(10,20)
@@ -679,9 +690,7 @@ if $ARGS[0] = 'topless_nude':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,40)>>.jpg"></center>'
 	'Already naked, you step onto the set and begin the shoot immediately.'
 	*nl
-	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield 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.'
-	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."'
-			
+	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield 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.'			
 	if pcs_mdlng >= 40 and commercial = 0:
 		act 'Leave':gt'foto_events','commercial'
 	else

locations/obj_din.qsrc

@@ -582,20 +582,22 @@ if $ARGS[0] = 'stats':
 		*nl
 		'<<modelfoto>> - Number of times you have worked as a model'
 		'<<modelfotomoney>> - The amount of money you''ve made modelling'
-		if modelfoto_fashion > 0: '<<modelfoto_fashion>> - Number of fashion shoots you have participated in'
-		if modelfoto_ero_clo > 0: '<<modelfoto_ero_clo>> - Number of erotic clothing shoots you have participated in'
-		if modelfoto_bikini > 0: '<<modelfoto_bikini>> - Number of swimsuit shoots you have modelled in'
-		if modelfoto_lingerie > 0: '<<modelfoto_lingerie>> - Number of lingerie shoots you have participated in'
-		if modelfoto_glamour > 0: '<<modelfoto_glamour>> - Number of glamour shoots you have participated in'
-		if modelfoto_tastenude > 0: '<<modelfoto_tastenude>> - Number of tasteful nude  shoots you have participated in'
-		if modelfoto_toplessnude > 0: '<<modelfoto_toplessnude>> - Number of topless nude shoots you have participated in'
-		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of full frontal nude shoots you have participated in'
-		if modelfoto_erotic > 0: '<<modelfoto_erotic>> - Number of softcore porn shoots you have participated in'
-		if modelfoto_nip > 0: '<<modelfoto_nip>> - Number of times your nipples have been visible as a model'
-		if modelfoto_topless > 0: '<<modelfoto_topless>> - Number of shoots where you have been topless'
-		if modelfoto_pussy > 0: '<<modelfoto_pussy>> - Number of shoots you have shown your pussy'
-		if modelfoto_asshole > 0: '<<modelfoto_asshole>> - Number of shoots you have shown your asshole'
 		*nl
+		if modelfoto_catalog > 0: '<<modelfoto_catalog>> - Number of catalog shoots you''ve done'
+		if modelfoto_fashion > 0: '<<modelfoto_fashion>> - Number of fashion shoots you''ve done'
+		if modelfoto_ero_clo > 0: '<<modelfoto_ero_clo>> - Number of sexy clothing shoots you''ve done'
+		if modelfoto_bikini > 0: '<<modelfoto_bikini>> - Number of swimsuit shoots you''ve done'
+		if modelfoto_lingerie > 0: '<<modelfoto_lingerie>> - Number of lingerie shoots you''ve done'
+		if modelfoto_glamour > 0: '<<modelfoto_glamour>> - Number of glamour shoots you''ve done'
+		if modelfoto_topless > 0: '<<modelfoto_topless>> - Number of topless shoots you''ve done'
+		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of shoots in which you have been nude'
+		if modelfoto_tastenude > 0: '<<modelfoto_tastenude>> - Number of shoots in which you have been nude but not shown breasts or pussy'
+		if modelfoto_toplessnude > 0: '<<modelfoto_toplessnude>> - Number of nude shoots you have shown your breasts but not your pussy'
+		if modelfoto_fullnude > 0: '<<modelfoto_fullnude>> - Number of full frontal nude shoots you''ve done'
+		if modelfoto_erotic > 0: '<<modelfoto_fullnude>> - Number of softcore erotic shoots you''ve done'
+		if modelfoto_nip > 0: '<<modelfoto_nip>> - Number of shoots your nipples have been visible'
+		if modelfoto_pussy > 0: '<<modelfoto_pussy>> - Number of shoots your pussy has been visible'
+		if modelfoto_asshole > 0: '<<modelfoto_asshole>> - Number of shoots your asshole has been visible'
 	end
 
 	if slavafuck > 0:'You have let Borislav fuck you <<slavafuck>> times'
@@ -983,13 +985,16 @@ if $ARGS[0] = 'stats_gen':
 		'<b>Modelling Stats</b>'
 		'<<modelfoto>> - Number of times you have worked as a model'
 		'<<modelfotomoney>> - The amount of money you''ve made modelling'
+		
+		if modelfoto_catalog > 0: '<<modelfoto_catalog>> - Number of catalog shoots you''ve done'
 		if modelfoto_fashion > 0: '<<modelfoto_fashion>> - Number of fashion shoots you''ve done'
 		if modelfoto_ero_clo > 0: '<<modelfoto_ero_clo>> - Number of sexy clothing shoots you''ve done'
 		if modelfoto_bikini > 0: '<<modelfoto_bikini>> - Number of swimsuit shoots you''ve done'
 		if modelfoto_lingerie > 0: '<<modelfoto_lingerie>> - Number of lingerie shoots you''ve done'
+		if modelfoto_glamour > 0: '<<modelfoto_glamour>> - Number of glamour shoots you''ve done'
 		if modelfoto_topless > 0: '<<modelfoto_topless>> - Number of topless shoots you''ve done'
 		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of shoots in which you have been nude'
-		if modelfoto_tastenude > 0: '<<modelfoto_nude>> - Number of shoots in which you have been nude but not shown breasts or pussy'
+		if modelfoto_tastenude > 0: '<<modelfoto_tastenude>> - Number of shoots in which you have been nude but not shown breasts or pussy'
 		if modelfoto_toplessnude > 0: '<<modelfoto_toplessnude>> - Number of nude shoots you have shown your breasts but not your pussy'
 		if modelfoto_fullnude > 0: '<<modelfoto_fullnude>> - Number of full frontal nude shoots you''ve done'
 		if modelfoto_erotic > 0: '<<modelfoto_fullnude>> - Number of softcore erotic shoots you''ve done'