[added] fitness shoots to the photo studio

[fixed] catalog jobs not counting for number of jobs per week
[changed] where you're taken after deciding not to do a shoot

locations/foto_shoot.qsrc

@@ -1,5 +1,13 @@
 # foto_shoot
 
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! --------------------------------------- Job Requests -----------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+
 if $ARGS[0] = 'model':
 	menu_off = 1
 	if model = 0:model = 1
@@ -41,6 +49,7 @@ if $ARGS[0] = 'model':
 			shoot_type = catalog
 			modelfoto += 1
 			modelfoto_catalog += 1
+			model_job_week += 1
 			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
@@ -61,6 +70,7 @@ if $ARGS[0] = 'model':
 			shoot_type = swim_catalog
 			modelfoto += 1
 			modelfoto_catalog += 1
+			model_job_week += 1
 			cla & *clr
 			mdlng_exp += rand(2,5)
 			minut += 120
@@ -87,7 +97,7 @@ if $ARGS[0] = 'model':
 				shoot_type = fashion
 				if modelfoto_fashion >= 10 and modelfoto_bikini + modelfoto_lingerie < 1 and modelfoto_glamour < 1 and modelfoto_nude < 1: gt'foto_events','lingerie_persuasion'
 				cla
-				act 'Maybe not today':gt 'foto','studio'
+				act 'Look at something else':gt 'foto','model'
 
 				act 'Agree (2:00)':gt 'foto_shoot','fashion'
 			end
@@ -98,7 +108,7 @@ if $ARGS[0] = 'model':
 				if modelfoto_bikini + modelfoto_lingerie >= 10 and pcs_mdlng > 20 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
 				if pcs_inhib < 20:
 					'You think about asking to do this shoot 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.'
-					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at something else':gt 'foto','model'
 					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
@@ -113,7 +123,7 @@ if $ARGS[0] = 'model':
 					end
 				else
 					cla
-					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at something else':gt 'foto','model'
 
 					act 'Agree (2:00)':gt'foto_shoot','bikini'
 				end
@@ -126,7 +136,7 @@ if $ARGS[0] = 'model':
 				if modelfoto_bikini + modelfoto_lingerie >= 10 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
 				if pcs_inhib < 25:
 					'You think about asking to do this shoot 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.'
-					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at something else':gt 'foto','model'
 					act 'Look at other options':gt'foto_shoot','model'
 					
 					if pcs_mdlng > 20:
@@ -141,7 +151,7 @@ if $ARGS[0] = 'model':
 					end	
 				else
 					cla
-					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at something else':gt 'foto','model'
 
 					act 'Agree (2:00)':gt'foto_shoot','lingerie'
 				end
@@ -164,14 +174,12 @@ if $ARGS[0] = 'model':
 			gt'foto_shoot', 'nude_shoot'
 		end
 	end
+	
+	if Fit['FMR'] = 0:
+		 act '"I''d like to do a fitness shoot"':gt'foto_shoot','fitness_shoot'
+	end
 end
 
-if $ARGS[0] = 'glamour_shoot':
-	cla & *clr
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	'"Alright, we can do that. What kind of glamour shoot?"'
-	
 !!	'Info guides:'
 !!	'<a href="exec:gs ''shortgs'',''msg'',''This type of shoot is not particularly more explicit, but the clothes being modelled are inherently more sensual and will require some confidence to be able to wear them.''">Erotic clothed</a>'
 !!	'<a href="exec:gs ''shortgs'',''msg'',''A topless shoot is any shoot that has you baring your breasts and shoulders while still wearing bottoms of some kind, whether that be trousers, skirt, or underwear.''">Topless</a>'
@@ -182,7 +190,7 @@ if $ARGS[0] = 'glamour_shoot':
 !!	act 'Erotic clothing with breast nudity':
 		!!already matched the exhibitionism value above
 !!		cla
-!!		act 'Maybe not today':gt 'foto','studio'
+!!		act 'Look at something else':gt 'foto','model'
 
 !!		act 'Agree (2:00)':
 !!			*clr & cla
@@ -206,6 +214,20 @@ if $ARGS[0] = 'glamour_shoot':
 !!			end
 !!		end
 !!	end
+
+
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------------- Glamour Requests ---------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'glamour_shoot':
+	cla & *clr
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Alright, we can do that. What kind of glamour shoot?"'
 	act 'Sexy clothing':
 		*clr & cla
 		shoot_type = sexy_clo
@@ -216,7 +238,7 @@ if $ARGS[0] = 'glamour_shoot':
 			else
 				'You think about asking to do this shoot 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.'			
 			end
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 20:
@@ -231,7 +253,7 @@ if $ARGS[0] = 'glamour_shoot':
 			end	
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 
 			act 'Agree (2:00)':gt'foto_shoot','sexy'
 		end
@@ -248,7 +270,7 @@ if $ARGS[0] = 'glamour_shoot':
 				'You think about asking to do this shoot 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.'			
 			end
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 40:
@@ -280,7 +302,7 @@ if $ARGS[0] = 'glamour_shoot':
 				'You think about asking to do this shoot 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.'			
 			end
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 40:
@@ -312,7 +334,7 @@ if $ARGS[0] = 'glamour_shoot':
 				'You think about asking to do this shoot 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.'			
 			end
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 45:
@@ -327,13 +349,19 @@ if $ARGS[0] = 'glamour_shoot':
 			end
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			
 			act 'Agree (2:00)':gt'foto_shoot','topless'
 		end
 	end
 end
 
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! -------------------------------------- Nude Requests -----------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
 if $ARGS[0] = 'nude_shoot':
 	cla & *clr
 	menu_off = 1
@@ -351,7 +379,7 @@ if $ARGS[0] = 'nude_shoot':
 				'You think about asking to do this shoot 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.'			
 			end		
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 35:
@@ -366,7 +394,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			
 			act 'Agree (2:00)':gt'foto_shoot','tasteful'
 		end
@@ -383,7 +411,7 @@ if $ARGS[0] = 'nude_shoot':
 				'You think about asking to do this shoot 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.'			
 			end
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 50:
@@ -398,7 +426,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			
 			act 'Agree (2:00)':gt'foto_shoot','topless_nude'
 		end
@@ -416,7 +444,7 @@ if $ARGS[0] = 'nude_shoot':
 				'You think about asking to do this shoot 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.'
 			end
 		
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 55:
@@ -431,7 +459,7 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 
 			act 'Agree (2:00)':gt'foto_shoot','nude'
 		end
@@ -449,7 +477,7 @@ if $ARGS[0] = 'nude_shoot':
 				'You think about asking to do this shoot 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.'			
 			end
 			
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 			act 'Look at other options':gt'foto_shoot','model'
 			
 			if pcs_inhib > 60:
@@ -464,13 +492,59 @@ if $ARGS[0] = 'nude_shoot':
 			end
 		else
 			cla
-			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at something else':gt 'foto','model'
 
 			act 'Agree (2:00)':gt'foto_shoot','erotic'
 		end
 	end
 end
 
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------------- Fitness Requests ---------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
+if $ARGS[0] = 'fitness_shoot':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Alright, what kind of shoot would you like to do? Sportwear, Sport underwear, or Artistic nude?"'
+	act 'Sportwear':
+		cla
+		act 'Look at something else':gt 'foto','model'
+
+		act 'Agree (2:00)':gt'foto_shoot','sportswear'
+	end
+	
+	act 'Sports underwear':
+		if pcs_inhib < 20:
+			msg' You think about asking to do this shoot 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
+			cla
+			act 'Look at something else':gt 'foto','model'
+
+			act 'Agree (2:00)':gt'foto_shoot','sports_underwear'
+		end
+	end
+            
+	act 'Artistic nude':
+		if pcs_inhib < 45:
+			msg' You think about asking to do this shoot 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
+			cla
+			act 'Look at something else':gt 'foto','model'
+
+			act 'Agree (2:00)':gt'foto_shoot','fitness_artistic_nude'
+		end
+	end
+end
+
+!! ----------------------------------------------------------------------------------------------------
+!!
+!! ------------------------------------- Modelling Shoots ---------------------------------------------
+!!
+!! ----------------------------------------------------------------------------------------------------
+
 if $ARGS[0] = 'fashion':
 	*clr & cla
 	minut += 120
@@ -771,16 +845,95 @@ if $ARGS[0] = 'erotic':
 	else
 		act 'Leave':gt 'foto', 'end'
 	end
+end
 
+if $ARGS[0] = 'sportswear':
+	*clr & cla
+	minut += 120
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelfoto_fitness += 1
+	pcs_sweat = 60
+	mdlng_exp += rand(2,4)
+	gs 'fame', 'city', 'modelling', rand(3,6)
+	gs 'stat'
+	if bodset = 2 and salocatnow >= 2:
+		*clr & cla
+		modelpayfin += 300
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FSM<<rand(1,4)>>.jpg"></center>'
+	else:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FSV<<rand(1,4)>>.jpg"></center>'
+	end
+	*nl
+	'Modeling sportwear, is slighty different from other jobs. First, you are taken to the near-by Havanna Fitness Center, as the studio doesn''t have all the necessary props to do it. Second, you must look "dynamic", and that means do some warm-ups, and add some oil, to give that "sweaty" and "sporty" look. After that, you are ready to pose the next two hours for the photographer.'
+	*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:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'sports_underwear':
+	*clr & cla
+	minut += 120
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10) + (city_sport/2)
+	modelfoto_fitness += 1
+	pcs_sweat = 60
+	gs 'fame', 'city', 'modelling', rand(3,6)
+	mdlng_exp += rand(3,6)
+	if pcs_inhib < 50:inhib_exp += 1
+	gs 'stat'
+	if bodset = 2 and salocatnow >= 2:
+		*clr & cla
+		modelpayfin += 325
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FUM<<rand(1,4)>>.jpg"></center>'
+	else:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FUV<<rand(1,4)>>.jpg"></center>'
+	end
+	*nl
+	'Modeling sport underwear, is slighty different from other jobs. First, you are taken to the Havanna Fitness Center, as the studio doesn''t have all the necessary props to do it. Second, you must look "dynamic", and that means do some warm-ups, and add some oil, to give that "sweaty" and "sporty" look. After that, you are ready to pose the next two hours for the photographer.'
+	*nl
+	'After having taken all his pictures, you and the crew head back to Aphrodite , counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	act 'Leave':gt 'foto', 'end'
 end
 
+if $ARGS[0] = 'fitness_artistic_nude':
+	*clr & cla
+	minut += 120
+	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc + city_sport
+	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+	modelfoto_fitness += 1
+	modelfoto_nude += 1
+	pcs_sweat = 60
+	mdlng_exp += rand(4,5)
+	gs 'fame', 'city', 'modelling', rand(5,10)
+	inhib_exp += 2
+	gs 'stat'	
+	if bodset = 2 and salocatnow >= 2:
+		*clr & cla
+		modelpayfin += 600
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FNM<<rand(1,4)>>.jpg"></center>'
+	else:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fitness/FNV<<rand(1,4)>>.jpg"></center>'
+	end
+	*nl
+	'Already naked, you do some warm-ups, work up a sweat, add some body-oil and step onto the set to begin the shoot.'
+	*nl
+	'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, are less provocative, than artistic, as they must show your body in movement so they can appear in sports-related advertisements, articles, and 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.'
+	act 'Leave':gt 'foto', 'end'
+end	
+
 !!	act 'Variety shoot':
 !!		if pcs_inhib < 60:
 !!			msg'You think about asking to do this shoot 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.'
 !!			gt 'foto', 'nude_shoot'
 !!		else
 !!			cla
-!!			act 'Maybe not today':gt 'foto','studio'
+!!			act 'Look at something else':gt 'foto','model'
 !!
 !!			act 'Agree (2:00)':
 !!				*clr & cla