Browse Source

foto enhancements and bug fixes

John Doe 2 years ago
parent
commit
35b49fc75b
5 changed files with 426 additions and 261 deletions
  1. 54 58
      locations/foto.qsrc
  2. 20 11
      locations/foto_albums.qsrc
  3. 206 28
      locations/foto_events.qsrc
  4. 30 30
      locations/foto_model_documentary.qsrc
  5. 116 134
      locations/foto_shoot.qsrc

+ 54 - 58
locations/foto.qsrc

@@ -149,6 +149,7 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
+	if modelfoto['nip'] > 0 and first_fame_event = 0: gt 'foto_events','fame'
 	if special_model['status'] < min(fame['city_modelling'], 700) and modelfoto['topless'] > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
 	if special_skill_model['status'] < pcs_mdlng and modelfoto['nip'] > 0 and skill_model_event ! daystart:gt 'foto_events','skill'
 	if foto['documentary'] >= 95 and $pantyworntype = 'none' and modelfoto['shoots']>= foto['documentary_timer']:gt'foto_model_documentary','1st_documentary'
@@ -414,7 +415,7 @@ if $ARGS[0] = 'studio':
 				end
 			end
 		end
-		if first_fame_event = 2:
+		if first_fame_event >= 2:
 			act'Ask if there''s special work available':gt'foto_events','special'
 		end
 		!!act'Check auditions':gt'foto_events2','auditions'
@@ -456,7 +457,7 @@ if $ARGS[0] = 'interview':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-	if foto_anush_referral = 1:	'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
+	if foto_anush_referral = 1: 'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
 	'"You want to work here? How old are you?"'
 	if age >= 18:
 		act'I''m <<age>>':
@@ -607,7 +608,7 @@ end
 
 if $ARGS[0] = 'job_decline':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	if foto_weight >= 25:
+	if foto_weight > 25:
 		'"I''m sorry," he says shaking his head. "You did lose weight, I''ll give you that, but it''s not quite enough for our requirements. But you''ve made progress. Give it a few more weeks of effort and come back again. We can still use you if you''re within the limit."'
 		act'Sigh':
 			cla & *clr
@@ -653,7 +654,7 @@ end
 if $ARGS[0] = 'job_offer':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	if foto_weight < 25 and foto_weight > 0:
+	if foto_weight <= 25 and foto_weight > 0:
 		if age_lie = 1 or age >= 18:
 			'"Well done!" he says, with a smile. "You''ve slimmed down to meet our requirements and you have a beautiful body. Now I just need your passport to confirm your age and put your info into our database, and you can be one of the registered models here at the studio."'
 			'He holds out his hand expectantly.'
@@ -914,26 +915,26 @@ if $ARGS[0] = 'bathroom':
 		end
 	end
 	if AlexandriaQW = 1:
-	    act'Listen to the gossip':
-	        *clr & cla
+			act'Listen to the gossip':
+					*clr & cla
 			AlexandriaQW = 2
 			gs 'stat'
-           	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
-            'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
-            '"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
-            '"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
-            '"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
-            '"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
-            '"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
-            '"You mean the props room?"'
-            'Okay, that''s a clue! Maybe you should search the props room?'
-            act'Continue':gt'foto','bathroom'
-        end
-    else
-	    act'Listen to the gossip':gt'foto_models','model_chatter'
+					 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
+						'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
+						'"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
+						'"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
+						'"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
+						'"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
+						'"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
+						'"You mean the props room?"'
+						'Okay, that''s a clue! Maybe you should search the props room?'
+						act'Continue':gt'foto','bathroom'
+				end
+		else
+			act'Listen to the gossip':gt'foto_models','model_chatter'
 	end
 	if AlexandriaQW = 2:
-	    act'Search the props'' room':gt'tatiana_missions','mission2A'
+			act'Search the props'' room':gt'tatiana_missions','mission2A'
 	end
 end
 
@@ -980,51 +981,46 @@ if $ARGS[0] = 'showers':
 					*nl
 					'Despite the openness of the shower area, you can''t help yourself and place the shower head between your legs, massaging your pussy with powerful jets of warm water and fingers. '
 
-					if hypnoAddict > 0:
-						'You unconsciously avoid spraying water into your vagina.'
-						act 'Dry off':gt 'foto', 'showers'
-					else
-						if pcs_horny >= 70:
-							if exhibitionist_lvl > 0:
-								$orgasm_or = 'no'
-								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
-								$orgasm_or = 'no'
-								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
-								$orgasm_or = 'yes'
-								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
-								gs 'stat'
-								pcs_mood += 15
-								$orgasm_or = 'yes'
-								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
-								gs 'arousal', 'end'
-								act 'Dry off':gt 'foto', 'showers'
-							else
-								gs 'arousal', 'masturbate', 'exhibitionism', 5
-								gs 'stat'
-								pcs_mood += 15
-								$orgasm_or = 'no'
-								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
-								$orgasm_or = 'no'
-								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
-								$orgasm_or = 'yes'
-								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
-								$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
-								gs 'arousal', 'end'
-								act 'Dry off':gt 'foto', 'showers'
-							end
+					if pcs_horny >= 70:
+						if exhibitionist_lvl > 0:
+							$orgasm_or = 'no'
+							gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
+							$orgasm_or = 'no'
+							gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
+							$orgasm_or = 'yes'
+							gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
+							gs 'stat'
+							pcs_mood += 15
+							$orgasm_or = 'yes'
+							$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
+							gs 'arousal', 'end'
+							act 'Dry off':gt 'foto', 'showers'
 						else
 							gs 'arousal', 'masturbate', 'exhibitionism', 5
 							gs 'stat'
-							pcs_horny += 5
-							pcs_mood += 10
-							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
+							pcs_mood += 15
+							$orgasm_or = 'no'
+							gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
+							$orgasm_or = 'no'
+							gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
+							$orgasm_or = 'yes'
+							gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
+							$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
 							gs 'arousal', 'end'
 							act 'Dry off':gt 'foto', 'showers'
 						end
+					else
+						gs 'arousal', 'masturbate', 'exhibitionism', 5
+						gs 'stat'
+						pcs_horny += 5
+						pcs_mood += 10
+						'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
+						gs 'arousal', 'end'
+						act 'Dry off':gt 'foto', 'showers'
 					end
-					cumspclnt = 8
-					gs 'cum_cleanup'
 				end
+				cumspclnt = 8
+				gs 'cum_cleanup'
 			end
 
 			act 'Get out of the shower':gt 'foto', 'showers'
@@ -1254,7 +1250,7 @@ if $ARGS[0] = 'end':
 		model_week = (daystart - week) / 7
 		modelfoto['shoots']+= 1
 		money += modelpayfin
-		modelfoto['earnings']  += modelpayfin
+		modelfoto['earnings'] += modelpayfin
 	else
 		practice_session = 0
 	end

+ 20 - 11
locations/foto_albums.qsrc

@@ -406,7 +406,7 @@ end
 if $ARGS[0] = 'sveta_10':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. You saw it before when you first joined the studio, but something has changed. You read the names from left to right and your heart stops when you see the final name.'
+	'Here is the shelf that has the albums of the top models. You saw it before when you first joined the studio, but something has changed. You read the names from left to right and your heart stops when you see the tenth name.'
 	'"<<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>."' 
 	'That''s your name! You''re one of the top 10 models of the studio!'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
@@ -419,13 +419,14 @@ if $ARGS[0] = 'sveta_10':
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">9. Anushka K.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end	
 	
 if $ARGS[0] = 'sveta_9':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. The albums names have changed yet again. Though the shock is not quite as dramatic as the first time, you take great pleasure in seeing your name has moved up the ranking again to the ninth spot. You''re higher than Anushka now. You wonder if she''ll be mad.'
+	'Here is the shelf that has the albums of the top models. The albums names have changed yet again. Though the shock is not quite as dramatic as the first time, you take great pleasure in seeing your name has moved up the ranking again to the ninth spot. You''re higher than Anushka now. You wonder if she''ll be mad.'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -436,6 +437,7 @@ if $ARGS[0] = 'sveta_9':
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	
 	act'Move away':gt'foto','studio'
 end
@@ -444,7 +446,7 @@ if $ARGS[0] = 'sveta_8':
 	*clr & cla
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. You''ve taken Mari''s spot in the rankings. Your name now marks the eighth spot, Mari''s in the ninth. You don''t think she''ll be upset or anything like that, she''ll probably want to congradulate you if nothing else. She was never one to care about the rankings. You take a moment to be amazed with the two of you, how far a farm girl from Gadukino and a schoolgirl from Pavlovsky have come... '
+	'Here is the shelf that has the albums of the top models. You''ve taken Mari''s spot in the rankings. Your name now marks the eighth spot, Mari''s in the ninth. You don''t think she''ll be upset or anything like that, she''ll probably want to congradulate you if nothing else. She was never one to care about the rankings. You take a moment to be amazed with the two of you, how far a farm girl from Gadukino and a schoolgirl from Pavlovsky have come... '
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -455,13 +457,14 @@ if $ARGS[0] = 'sveta_8':
 	'<a href="exec:gt ''foto_albums'',''sveta''">8. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 
 if $ARGS[0] = 'sveta_7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. Up the ranks again! Number 7 this time! Maybe your career as a model has more potential than you thought.'
+	'Here is the shelf that has the albums of the top models. Up the ranks again! Number 7 this time! Maybe your career as a model has more potential than you thought.'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -472,13 +475,14 @@ if $ARGS[0] = 'sveta_7':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 	
 if $ARGS[0] = 'sveta_6':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. The albums have changed again and you find yourself taking Lily''s sixth place seat. You are now more famous as a model than a porn star! Wait, is that a good thing?'
+	'Here is the shelf that has the albums of the top models. The albums have changed again and you find yourself taking Lily''s sixth place seat. You are now more famous as a model than a porn star! Wait, is that a good thing?'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -489,13 +493,14 @@ if $ARGS[0] = 'sveta_6':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 	
 if $ARGS[0] = 'sveta_5':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. When you started modelling, you never imagined you''d do this well. Not even in your dreams did you think you could become one of the top five models in St. Petersburg.'
+	'Here is the shelf that has the albums of the top models. When you started modelling, you never imagined you''d do this well. Not even in your dreams did you think you could become one of the top five models in St. Petersburg.'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -506,13 +511,14 @@ if $ARGS[0] = 'sveta_5':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 	
 if $ARGS[0] = 'sveta_4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. Reading the album names, you find that yours has been shifted over yet again! This time to the fourth spot from the left. You''ve done quite well all things considered. With your new ranking, you''re pretty sure your career as a model is secure.'
+	'Here is the shelf that has the albums of the top models. Reading the album names, you find that yours has been shifted over yet again! This time to the fourth spot from the left. You''ve done quite well all things considered. With your new ranking, you''re pretty sure your career as a model is secure.'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
@@ -523,13 +529,14 @@ if $ARGS[0] = 'sveta_4':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 	
 if $ARGS[0] = 'sveta_3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. As you read from left to right, you see that your name is now third. You finally took Emily''s spot! She isn''t very happy about it, but who cares? You''ve broken the barrier into being famous!'
+	'Here is the shelf that has the albums of the top models. As you read from left to right, you see that your name is now third. You finally took Emily''s spot! She isn''t very happy about it, but who cares? You''ve broken the barrier into being famous!'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">3. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
@@ -540,6 +547,7 @@ if $ARGS[0] = 'sveta_3':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 	
@@ -547,7 +555,7 @@ if $ARGS[0] = 'sveta_2':
 	*clr & cla
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. You look and you see your name is second, right before Anastasia''s. Are you really this close? Could you take the number one spot all for yourself?'
+	'Here is the shelf that has the albums of the top models. You look and you see your name is second, right before Anastasia''s. Are you really this close? Could you take the number one spot all for yourself?'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">2. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
@@ -558,7 +566,7 @@ if $ARGS[0] = 'sveta_2':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
-	
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 
@@ -567,7 +575,7 @@ if $ARGS[0] = 'sveta_1':
 	*clr & cla
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
-	'Here is the shelf that has the albums of the top 10 models. You finally did it! Listed at the very front of all of the albums is your name. Women wish they were you, men want to fuck you, and you''re likely to start getting offers in other parts of the entertainment industry. You''re the top model!'
+	'Here is the shelf that has the albums of the top models. You finally did it! Listed at the very front of all of the albums is your name. Women wish they were you, men want to fuck you, and you''re likely to start getting offers in other parts of the entertainment industry. You''re the top model!'
 	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">2. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
@@ -578,6 +586,7 @@ if $ARGS[0] = 'sveta_1':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
+	'<a href="exec:gt ''foto_albums'',''olga''">11. Olga K.</a>'
 	act'Move away':gt'foto','studio'
 end
 

+ 206 - 28
locations/foto_events.qsrc

@@ -5,13 +5,13 @@ menu_off = 1
 if $ARGS[0] = 'fame':
 	modelpay = (pcs_mdlng/2 * 10) + ((min(fame['city_modelling'], 700) + pcs_apprnc)/2)
 	:reroll_1
-	special_model = 2000
-	special_skill_model = 2000
+	special_model['status'] = 2000
+	special_skill_model['status'] = 2000
 	fame_model_event = daystart
 	if first_fame_event < 1:
 		gt'foto_events','topless1'
 	else
-		mdlng_fame_event = rand(1,3)
+		mdlng_fame_event = rand(1,4)
 		if mdlng_fame_event = 1 and sunWeather = 1 and daystage < 3:
 			gt'foto_events','pool1'
 		elseif mdlng_fame_event = 2 and pcs_agil >= 40:
@@ -20,6 +20,8 @@ if $ARGS[0] = 'fame':
 			gt'foto_events','pool1'
 		elseif mdlng_fame_event = 3:
 			gt'foto_events2','champagne1'
+		elseif mdlng_fame_event = 4:
+			gt'foto_events','topless1'
 		else
 			jump 'reroll_1'
 		end
@@ -382,6 +384,7 @@ if $ARGS[0] = 'commercial':
 						act '"No, it''s too much for me"':
 							cla
 							*nl
+							 commercial = 0
 							'"No," you say with some regret. "Even with all that money, that''s not the kind of model or actress I want to be known for."'
 							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<$pcs_firstname>>"'
 							act 'Go back to modelling':gt 'foto', 'studio'
@@ -477,9 +480,69 @@ if $ARGS[0] = 'fashion_persuasion':
 	end
 end
 
-if $ARGS[0] = 'lingerie_persuasion':
+if $ARGS[0] = 'bikini_persuasion':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"I''d like to do a fashion shoot," you say.'
+	if foto_persuade = 0:
+		'By the way <<$pcs_firstname>>, you''ve been here a while, you''ve done quite a few fashion jobs for us and your work for us has been great!"'
+		'"Oh! Thanks!"'
+		'"But we also think that you could take it a step farther, show off more of your beautiful body. How would you feel about doing a bikini shoot? The exposure is about the same but the pay is a little bit better. What do you say?"'
+	elseif foto_persuade = 2:
+		'"By the way <<$pcs_firstname>>, the staff have been talking again. You remember how we originally had to ask you to give fashion shoots a try? We were thinking that it might be time for you to take another step and try out a bikini shoot? The exposure is about the same but bikini shoots pay a little bit more than fashion. What do you say? Give it a try?"'
+	elseif foto_persuade = 1:
+		'"We can do a fashion shoot today if you like, but the studio would still really love to see you do that bikini shoot. What do you say?"'
+	end
+	
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			foto['suborn'] += 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, but I think I''ll keep on doing regular fashion shoots for now."'
+			'"Oh. Okay..."'
+			act'Do the fashion shoot':gt'foto_shoot','fashion'
+		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>'
+	end
+	
+	if foto_persuade = 2 and pcs_inhib < 20:
+		act'I guess so':
+			cla & *clr
+			foto['suborn'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... I guess it turned out well last time..."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			act'Do the bikini shoot':gt'foto_shoot','bikini'
+		end
+	else
+		act'Yes':
+			cla & *clr
+			foto_persuade = 2
+			foto['suborn'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"That sounds really good actually! I''ll do it!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			act'Do the bikini shoot':gt'foto_shoot','bikini'
+		end
+	end
+end
+
+if $ARGS[0] = 'lingerie_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"I''d like to do a bikini shoot," you say.'
 	if foto_persuade = 0:
 		'By the way <<$pcs_firstname>>, you''ve been here a while, you''ve done quite a few fashion jobs for us and your work for us has been great!"'
 		'"Oh! Thanks!"'
@@ -811,9 +874,19 @@ if $ARGS[0] = 'topless_persuasion':
 			'"Thanks for the offer, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
 			if $modelfoto['shoot_type'] = 'trans_ling':
-				act'Do the lingerie shoot':gt'foto_shoot','trans_ling'
+				'"Well how about a transparent lingerie shoot? Nothing explicit shown and you could be on the cover of magazines."'
+				act'No':gt'foto_shoot','transparent'
+				act'That''s not so bad...':
+					cla & *clr
+					foto_persuade = 0
+					foto['suborn'] = 0
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"That''s not so bad I guess... I''m already doing topless so that''s which exposes even more."'
+					'"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 transparent lingerie shoot':gt'foto_shoot','trans_ling'
+				end
 			else
-				act'Do the transparent shoot':gt'foto_shoot','transparent'
+				act'Do the lingerie shoot':gt'foto_shoot','trans_ling'
 			end
 		end
 	else
@@ -886,8 +959,29 @@ if $ARGS[0] = 'nude_persuasion':
 			'"Thanks for the offer, that''s really kind, but I think I''ll stick to what I''m doing for now."'
 			'"Oh. Okay..."'
 			if $modelfoto['shoot_type'] = 'topless':
-				act'Do the topless shoot':gt'foto_shoot','topless'
+				'"Well how about a tasteful nude shoot? Nothing explicit shown and you could be on the cover of magazines."'
+				act'No':gt'foto_shoot','topless'
+				act'That''s not so bad...':
+					cla & *clr
+					foto_persuade = 0
+					foto['suborn'] = 0
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"That''s not so bad I guess... I''m already doing topless so that''s which exposes even more."'
+					'"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 tasteful nude shoot':gt'foto_shoot','tasteful'
+				end
 			elseif $modelfoto['shoot_type'] = 'taste_nude':
+				'"Well how about a topless nude shoot?"'
+				act'No':gt'foto_shoot','tasteful'
+				act'That''s not so bad...':
+					cla & *clr
+					foto_persuade = 0
+					foto['suborn'] = 0
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"That''s not so bad I guess... I''m already doing topless so that''s which exposes even more."'
+					'"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 topless nude shoot':gt'foto_shoot','topless_nude'
+				end
 				act'Do the tasteful nude shoot':gt'foto_shoot','tasteful'
 			elseif $modelfoto['shoot_type'] = 'top_nude':
 				act'Do the topless nude shoot':gt'foto_shoot','topless_nude'
@@ -917,7 +1011,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'The manager smiles wide at you. "Thank you so much for your courage <<$pcs_firstname>>."'
 			'"The special bonus doesn''t hurt either," you smile back shyly.'
 			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
-			foto_persuade = 5
+			foto_persuade = 0
 			act'Do the nude shoot':gt'foto_shoot','nude'
 		end
 	elseif foto_persuade = 1:
@@ -926,7 +1020,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? I think I''m ready to do it today! I''ll do the nude shoot," you say, smiling. "And I''ll take the bonus."'
 			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
-			foto_persuade = 5
+			foto_persuade = 0
 			act'Do the nude shoot':gt'foto_shoot','nude'
 		end
 	end
@@ -936,11 +1030,91 @@ if $ARGS[0] = 'nude_persuasion':
 		'"Wow! That''s a really amazing offer! That''s so generous! Yes! I''ll absolutely do it!"'
 		'The manager smiles wide at you.'
 		'"Great! Then go to this set here and the photographer will be ready for you."'
-		foto_persuade = 5
+		foto_persuade = 0
 		act'Do the nude shoot':gt'foto_shoot','nude'
 	end
 end
 
+if $ARGS[0] = 'erotic_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	if foto_persuade = 0:
+		'"Hey, <<$pcs_firstname>>, I just wanted to say, your work has been stunning lately! Really fantastic!"'
+		'"Oh! Uhh, thanks!"'
+		'"Your work is so great, we would love to show everything you''ve got to offer. Now, feel free to say no, but what do you say to a erotic nude shoot? I know it might be a little explicit, but the studio and our readers would love it. What do you say?"'
+	elseif foto_persuade = 1:
+		'"Hey, that''s cool <<$pcs_firstname>>. But I just want you to know that the studio is still interested in an erotic nude shot when you''re ready."'
+	elseif foto_persuade = 2:
+		'"Hey <<$pcs_firstname>>, I''ve got a new offer from the studio for you. They''ve really loved your willingness to try new things like with the past shoots and all and they wanted to know if you would like to step it up to the final level?"'
+	end
+	
+	if foto['suborn'] >= 5:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	elseif foto['suborn'] >= 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'medium'
+	elseif foto['suburn'] > 0:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+	else
+		will_cost = 0
+	end
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			foto['suborn'] += 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, that''s really kind, but I think I''ll stick to what I''m doing for now."'
+			'"Oh. Okay..."'
+			act'Do nude shoot':gt'foto_shoot','nude'
+		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>'
+	end
+	
+	if foto_persuade = 2 and pcs_inhib < 60:
+		act'Wow! I... I guess I''ll take it':
+			cla & *clr
+			foto['suborn'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Wow! That''s a really amazing offer! I mean... well to be honest, I''m not sure if I''m ready for that but... I guess, I''ll do it if the studio really believes in me so much."'
+			'The manager smiles wide at you.'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the erotic nude shoot':gt'foto_shoot','erotic'
+		end
+	end
+	if foto_persuade = 1 and pcs_inhib < 60:
+		act'Well... I guess':
+			cla & *clr
+			foto['suborn'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well..." You mull it over a little bit more, still unsure of yourself. "I mean, I... I guess I can give it a try."'
+			'The manager smiles wide at you. "Thank you so much for your courage <<$pcs_firstname>>."'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the erotic nude shoot':gt'foto_shoot','erotic'
+		end
+	elseif foto_persuade = 1:
+		act'Yes, I''m ready':
+			cla & *clr
+			foto['suborn'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"You know what? I think I''m ready to do it today! I''ll do the erotic nude shoot," you say, smiling.'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the erotic nude shoot':gt'foto_shoot','erotic'
+		end
+	end
+	act'Wow! Yes!':
+		cla & *clr
+		foto['suborn'] = 0
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Wow! That''s a really amazing offer! That''s so generous! Yes! I''ll absolutely do it!"'
+		'The manager smiles wide at you.'
+		'"Great! Then go to this set here and the photographer will be ready for you."'
+		foto_persuade = 5
+		act'Do the erotic nude shoot':gt'foto_shoot','erotic'
+	end
+end
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
 
 if $ARGS[0] = 'special':
@@ -982,16 +1156,16 @@ if $ARGS[0] = 'list':
 		'You wave goodbye as you walk back to the main floor.'
 		act'Go back to the main floor':gt'foto','studio'
 	end
-	if specialjob1 > 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
-	if specialjob2 > 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
-	if specialjob3 > 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
-	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
-	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
-	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">   Kickboxing documentary</a>'
-    if specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">   Track & Field documentary</a>'
+	if specialjob1 > 95:'<a href="exec:gt ''foto_events'',''high_fashion''"> High Fashion</a>'
+	if specialjob2 > 95:'<a href="exec:gt ''foto_events'',''fine_art''"> Fine Art Project(sex)</a>'
+	if specialjob3 > 95:'<a href="exec:gt ''foto_events'',''modern_art''"> Modern Art Project(69)</a>'
+	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''"> Aphrodite Advert</a>'
+	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''"> Independent Art Project</a>'
+	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''"> Designer Wedding Dress</a>'
+	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">  Kickboxing documentary</a>'
+		if specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">  Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
-!!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
+!!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''"> Documentary</a>'
 end
 
 if $ARGS[0] = 'high_fashion':
@@ -1165,7 +1339,7 @@ if $ARGS[0] = 'fine_art':
 				else
 					act'What?! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				if pcs_vag > 0:
+				if stat['vaginal'] > 0 and pcs_vag > 0:
 					act'Say nothing, do as instructed':
 						fine_art_deal = 4
 						gt'foto_events','fine_art2'
@@ -1242,8 +1416,8 @@ if $ARGS[0] = 'fine_art2':
 		'The woman steps forward, reaching into her purse to pull out <<modelpayfin>> <b>₽</b>, which she places in your hand.'
 		'"I am disappointed with your commitment," she says. "Great people should be willing to sacrifice for the sake of great art. I vish you vere one of those people." She shakes her head and walks away, snapping her fingers twice and causing her crew to start packing up equipment.'
 		*nl
-		if pcs_vag = 0:'You watch them leave, the money from the job in hand and your virginity still intact.'
-		if pcs_vag > 0:'You watch them leave, the money from the job in hand and your dignity still intact.'
+		if pcs_vag = 0 or stat['vaginal'] = 0:'You watch them leave, the money from the job in hand and your virginity still intact.'
+		if pcs_vag > 0 and stat['vaginal'] > 0:'You watch them leave, the money from the job in hand and your dignity still intact.'
 		act'Leave':
 			fine_art_deal = 0
 			gt'foto','studio'
@@ -1584,7 +1758,10 @@ if $ARGS[0] = 'topless1.1':
 								mdlng_exp += rand(8,10)
 								gs 'fame', 'city', 'modelling', 'medium'
 								act'Leave':
-									msg'You''ve shown the studio that you''re willing to go above and beyond what is normally asked of you and that you''re willing to capitalize on your popularity as a model. The photographers might come to you for more off-site shoots like this in the future. Additionally, you are now considered a viable candidate for special requests that might be asked of the studio. Each day there may or may not be such work available for you. Check with the photographers if you want to supplement your income with these specialized jobs.'
+									if first_fame_event < 3: 
+										first_fame_event = 3
+										msg'You''ve shown the studio that you''re willing to go above and beyond what is normally asked of you and that you''re willing to capitalize on your popularity as a model. The photographers might come to you for more off-site shoots like this in the future. Additionally, you are now considered a viable candidate for special requests that might be asked of the studio. Each day there may or may not be such work available for you. Check with the photographers if you want to supplement your income with these specialized jobs.'
+									end
 									gt'city_center'
 								end
 							end
@@ -2065,7 +2242,7 @@ if $ARGS[0] = 'runway2':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'Hey <<$pcs_firstname>>, listen. We have an emergency situation and we''re looking for whoever is available. A clothing studio we sometimes shoot for is having a fashion show tonight but for some reason something''s gone wrong and they''re missing models."'
 			'"Missing models?" you gasp. "You mean like they''ve disappeared or something?"'
-			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until 22:00 tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
+			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until 21:00 tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
 			gs 'willpower', 'exhib', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act'"I''m sorry, I can''t be out that late" (<<will_cost>> Willpower)':
@@ -2116,11 +2293,12 @@ if $ARGS[0] = 'runway2':
 						pcs_hairbsh = 1
 						pcs_makeup = 4
 						pcs_lipbalm += 8
-						hour = 19
+						gs 'stat'
+						minut = 60*(19-hour) + (60-minut)
 						'The runway crew shows up and immediately moves you to the makeup station to get your hair and everything done. They really shovel it on for this. A bit different to the subtle makeup you normally put on for modelling.'
 						'They put you into the clothes that they''ve decided you''re going to be modelling and you wait for the show to begin.'
 						act'Continue':
-							hour += 1
+							minut += 60
 							modelpayfin = 500 + (fame['city_modelling'] * 10) + (modelpay * 3) + (50*rand(0,7))
 							if rand(0,1) = 1:
 								gs 'fame', 'city', 'modelling', 'medium'
@@ -2161,7 +2339,7 @@ if $ARGS[0] = 'runway2':
 							end
 							act'Continue':
 								*clr & cla
-								hour += 1
+								minut += 60
 								money += modelpayfin
 								modelfoto['earnings'] += modelpayfin
 								gs'stat'
@@ -2199,7 +2377,7 @@ if $ARGS[0] = 'wet':
 			'You regard him somewhat suspiciously as he never actually says what the shoot is.'
 			act'"And the shoot is...?"':
 				*clr & cla
-				'"And the shoot is...?"  you ask leadingly.'
+				'"And the shoot is...?" you ask leadingly.'
 				'He looks awkward like he doesn''t know what to say for a moment until he finally explains, "Well, it''s a shoot here in the studio but we need you to be wet for it. So we''re going to need you to get on set naked and then we''ll take a hose and spray you for the duration of the shoot. Most girls say no when we tell them what we''re going to do because they find it unpleasent. So? How about it? We''ll pay you for it and it won''t count as your weekly job."'
 				
 				gs 'willpower', 'exhib', 'resist'

+ 30 - 30
locations/foto_model_documentary.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = '1st_documentary':
 	*nl
 	'"They''re paying the equivalent of a two hour nude shoot for every model that participates. Do you want in?"'
 	
-	if modelfoto_nip < 1:
+	if modelfoto['nip'] < 1:
 		act'No way! I''ve never been naked on camera before!':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -170,35 +170,35 @@ if $ARGS[0] = 'documentary_1':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
 			if age >= 18:
-				if modelfoto_erotic > 0:
+				if modelfoto['erotic'] > modelfoto['nude']:
 					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m an erotic model at Aphrodite photography."'
-				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+				elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m an artistic nude model at Aphrodite photography."'
-				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+				elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a fitness model at Aphrodite photography."'
-				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
-					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a glamour model at Aphrodite photography."'						
-				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
-					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a lingerie model at Aphrodite photography."'						
-				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+				elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog']:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a glamour model at Aphrodite photography."'
+				elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog']:
+					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a lingerie model at Aphrodite photography."'
+				elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a fashion model at Aphrodite photography."'
 				else
 					'"My name is <<$pcs_firstname>>. I''m <<age>> years old, and I''m a catalog model at Aphrodite photography."'
 				end
 			else
-				if modelfoto_erotic > 0:
+				if modelfoto['erotic'] > modelfoto['nude']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m an erotic model at Aphrodite photography."'
-				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+				elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m an artistic nude model at Aphrodite photography."'
-				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+				elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a fitness model at Aphrodite photography."'
-				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+				elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a glamour model at Aphrodite photography."'
-				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+				elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a lingerie model at Aphrodite photography."'
-				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+				elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a fashion model at Aphrodite photography."'
-				elseif modelfoto_catalog > 0:
+				elseif modelfoto['catalog'] > 0:
 					'"My name is <<$pcs_firstname>>. I''m <<model[''age'']>> years old, and I''m a catalog model at Aphrodite photography."'
 				end
 			end
@@ -210,37 +210,37 @@ if $ARGS[0] = 'documentary_1':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
 			if age >= 18:
-				if modelfoto_erotic > 0:
+				if modelfoto['erotic'] > modelfoto['nude']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m an erotic model at Aphrodite photography."'
-				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+				elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m an artistic nude model at Aphrodite photography."'
-				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+				elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a fitness model at Aphrodite photography."'
-				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+				elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a glamour model at Aphrodite photography."'
-				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+				elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a lingerie model at Aphrodite photography."'
-				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+				elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a fashion model at Aphrodite photography."'
-				elseif modelfoto_catalog > modelfoto_fashion and modelfoto_catalog > modelfoto_fitness and modelfoto_catalog > modelfoto_glamour and modelfoto_catalog > modelfoto_lingerie:
+				elseif modelfoto['catalog'] > modelfoto['fashion'] and modelfoto['catalog'] > modelfoto['fitness'] and modelfoto['catalog'] > modelfoto['glamour'] and modelfoto['catalog'] > modelfoto['lingerie']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a catalog model at Aphrodite photography."'
 				else
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<age>> years old, and I''m a model at Aphrodite photography."'
 				end
 			else
-				if modelfoto_erotic > 0:
+				if modelfoto['erotic'] > modelfoto['nude']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m an erotic model at Aphrodite photography."'
-				elseif modelfoto_nude > modelfoto_fashion and modelfoto_nude > modelfoto_fitness and modelfoto_nude > modelfoto_glamour and modelfoto_nude > modelfoto_lingerie and modelfoto_nude > modelfoto_catalog:
+				elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m an artistic nude model at Aphrodite photography."'
-				elseif modelfoto_fitness > modelfoto_fashion and modelfoto_fitness > modelfoto_nude and modelfoto_fitness > modelfoto_glamour and modelfoto_fitness > modelfoto_lingerie and modelfoto_fitness > modelfoto_catalog:
+				elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a fitness model at Aphrodite photography."'
-				elseif modelfoto_glamour > modelfoto_fashion and modelfoto_glamour > modelfoto_nude and modelfoto_glamour > modelfoto_fitness and modelfoto_glamour > modelfoto_lingerie and modelfoto_glamour > modelfoto_catalog:
+				elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a glamour model at Aphrodite photography."'
-				elseif modelfoto_lingerie > modelfoto_fashion and modelfoto_lingerie > modelfoto_nude and modelfoto_lingerie > modelfoto_fitness and modelfoto_lingerie > modelfoto_glamour and modelfoto_lingerie > modelfoto_catalog:
+				elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a lingerie model at Aphrodite photography."'
-				elseif modelfoto_fashion > modelfoto_lingerie and modelfoto_fashion > modelfoto_nude and modelfoto_fashion > modelfoto_fitness and modelfoto_fashion > modelfoto_glamour and modelfoto_fashion > modelfoto_catalog:
+				elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a fashion model at Aphrodite photography."'
-				elseif modelfoto_catalog > modelfoto_fashion and modelfoto_catalog > modelfoto_fitness and modelfoto_catalog > modelfoto_glamour and modelfoto_catalog > modelfoto_lingerie:
+				elseif modelfoto['catalog'] > modelfoto['fashion'] and modelfoto['catalog'] > modelfoto['fitness'] and modelfoto['catalog'] > modelfoto['glamour'] and modelfoto['catalog'] > modelfoto['lingerie']:
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a catalog model at Aphrodite photography."'
 				else
 					'"My name is <<$pcs_firstname>>, but my friends call me <<$pcs_nickname>>. I''m <<model[''age'']>> years old, and I''m a model at Aphrodite photography."'

+ 116 - 134
locations/foto_shoot.qsrc

@@ -36,59 +36,9 @@ if $ARGS[0] = 'model':
 		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
 		act'Leave':gt 'foto','studio'
 	end
-	
-	act'Actually I''d like to practice':gt'foto_practice','start'
-		
-	act'"I''d like to do a catalog shoot"':
-		cla & *clr
-		if modelfoto['shoots'] >= 10 and pcs_mdlng > 20 and modelfoto['fashion'] < 1:gt'foto_events','fashion_persuasion'
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-		'"Alright, what kind of shoot? Clothing or swimsuits?"'
-		
-		act'Clothing':
-			$modelfoto['shoot_type'] = 'catalog'
-			modelfoto['shoots'] += 1
-			model_week = (daystart - week) / 7
-			modelfoto['catalog'] += 1
-			model_job_week += 1
-			mdlng_exp += rand(2,5)
-			gs 'fame', 'city', 'modelling', 'tiny'
-			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
-			cla & *clr
-			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', 'studio'
-		end
-		act'Swimsuits':
-			$modelfoto['shoot_type'] = 'swim_catalog'
-			modelfoto['shoots'] += 1
-			model_week = (daystart - week) / 7
-			modelfoto['catalog'] += 1
-			model_job_week += 1
-			mdlng_exp += rand(2,5)
-			gs 'fame', 'city', 'modelling', 'tiny'
-			minut += 120
-			money += 450
-			modelfoto['earnings'] += 450
-			cla & *clr
-			'<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', 'studio'
-		end
-	end
-	
+
+	if Fit['FMR'] = 1:act '"I''d like to do a fitness shoot"':gt'foto_shoot','fitness_shoot'
+
 	act'"I''d like to do a fashion shoot"':
 		if pcs_mdlng < 20:
 			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
@@ -98,17 +48,14 @@ if $ARGS[0] = 'model':
 			'"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
 			act 'Fashion':
 				$modelfoto['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 'Look at something else':gt 'foto_shoot','model'
-
-				act 'Agree (2:00)':gt 'foto_shoot','fashion'
+				if modelfoto['fashion'] >= 5 and modelfoto['bikini'] < 1 and modelfoto['lingerie'] < 1 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1: gt'foto_events','bikini_persuasion'
+				gt 'foto_shoot','fashion'
 			end
 
 			act 'Bikini':
 				$modelfoto['shoot_type'] = 'bikini'
 				*clr & cla
-				if modelfoto['bikini'] + modelfoto['lingerie'] >= 10 and pcs_mdlng > 20 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1:gt'foto_events','glamour_persuasion'
+				if modelfoto['bikini'] >= 5 and modelfoto['lingerie'] < 1 and pcs_mdlng > 20 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1:gt'foto_events','lingerie_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 'Look at something else':gt 'foto_shoot','model'
@@ -124,18 +71,14 @@ if $ARGS[0] = 'model':
 						act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','bikini'
 					end
 				else
-					cla
-					act 'Look at something else':gt 'foto_shoot','model'
-
-					act 'Agree (2:00)':gt'foto_shoot','bikini'
+					gt'foto_shoot','bikini'
 				end
 			end
 
-
 			act 'Lingerie modelling':
 				$modelfoto['shoot_type'] = 'lingerie'
 				*clr & cla
-				if modelfoto['bikini'] + modelfoto['lingerie'] >= 10 and modelfoto['glamour'] < 1 and modelfoto['nude'] < 1:gt'foto_events','glamour_persuasion'
+				if modelfoto['bikini'] >= 5 and modelfoto['lingerie'] >= 5 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 'Look at something else':gt 'foto_shoot','model'
@@ -149,12 +92,9 @@ if $ARGS[0] = 'model':
 						*nl
 						'Or you could just force yourself do it anyways...'
 						act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','lingerie'
-					end	
+					end
 				else
-					cla
-					act 'Look at something else':gt 'foto_shoot','model'
-
-					act 'Agree (2:00)':gt'foto_shoot','lingerie'
+					gt'foto_shoot','lingerie'
 				end
 			end
 		end
@@ -167,7 +107,7 @@ if $ARGS[0] = 'model':
 			gt'foto_shoot', 'glamour_shoot'
 		end
 	end
-	
+
 	act'"I''d like to do a nude shoot"':
 		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.'
@@ -176,9 +116,57 @@ if $ARGS[0] = 'model':
 		end
 	end
 	
-	if Fit['FMR'] = 1:
-		 act '"I''d like to do a fitness shoot"':gt'foto_shoot','fitness_shoot'
+	act'"I''d like to do a catalog shoot"':
+		cla & *clr
+		if modelfoto['shoots'] >= 10 and pcs_mdlng > 20 and modelfoto['fashion'] < 1:gt'foto_events','fashion_persuasion'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Alright, what kind of shoot? Clothing or swimsuits?"'
+		
+		act'Clothing':
+			$modelfoto['shoot_type'] = 'catalog'
+			modelfoto['shoots'] += 1
+			model_week = (daystart - week) / 7
+			modelfoto['catalog'] += 1
+			model_job_week += 1
+			mdlng_exp += rand(2,5)
+			gs 'fame', 'city', 'modelling', 'tiny'
+			minut += 120
+			money += 450
+			modelfoto['earnings'] += 450
+			cla & *clr
+			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', 'studio'
+		end
+		act'Swimsuits':
+			$modelfoto['shoot_type'] = 'swim_catalog'
+			modelfoto['shoots'] += 1
+			model_week = (daystart - week) / 7
+			modelfoto['catalog'] += 1
+			model_job_week += 1
+			mdlng_exp += rand(2,5)
+			gs 'fame', 'city', 'modelling', 'tiny'
+			minut += 120
+			money += 450
+			modelfoto['earnings'] += 450
+			cla & *clr
+			'<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', 'studio'
+		end
 	end
+	
+	act'Actually I''d like to practice':gt'foto_practice','start'
 end
 
 !!	'Info guides:'
@@ -237,7 +225,7 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['sexy'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
 			act 'Look at other glamour options':gt'foto_shoot','glamour_shoot'
@@ -251,12 +239,9 @@ if $ARGS[0] = 'glamour_shoot':
 				*nl
 				'Or you could just force yourself do it anyways...'
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','sexy'
-			end	
+			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-
-			act 'Agree (2:00)':gt'foto_shoot','sexy'
+			gt'foto_shoot','sexy'
 		end
 	end
 
@@ -268,7 +253,7 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['transparent'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -283,12 +268,9 @@ if $ARGS[0] = 'glamour_shoot':
 				*nl
 				'Or you could just force yourself do it anyways...'
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','transparent'
-			end	
+			end
 		else
-			cla
-			act 'Not for me':gt 'foto','studio'
-
-			act 'Agree (2:00)':gt'foto_shoot','transparent'
+			gt'foto_shoot','transparent'
 		end
 	end
 	
@@ -300,7 +282,7 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['trans_ling'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -317,10 +299,7 @@ if $ARGS[0] = 'glamour_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','trans_ling'
 			end	
 		else
-			cla
-			act 'Not for me':gt 'foto','studio'
-
-			act 'Agree (2:00)':gt'foto_shoot','trans_ling'
+			gt'foto_shoot','trans_ling'
 		end
 	end
 
@@ -332,7 +311,7 @@ if $ARGS[0] = 'glamour_shoot':
 			if modelfoto['topless'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -349,10 +328,7 @@ if $ARGS[0] = 'glamour_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','topless'
 			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-			
-			act 'Agree (2:00)':gt'foto_shoot','topless'
+			gt'foto_shoot','topless'
 		end
 	end
 end
@@ -377,7 +353,7 @@ if $ARGS[0] = 'nude_shoot':
 			if modelfoto['tastenude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -394,10 +370,7 @@ if $ARGS[0] = 'nude_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','tasteful'
 			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-			
-			act 'Agree (2:00)':gt'foto_shoot','tasteful'
+			gt'foto_shoot','tasteful'
 		end
 	end
 	
@@ -409,7 +382,7 @@ if $ARGS[0] = 'nude_shoot':
 			if modelfoto['toplessnude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -426,16 +399,14 @@ if $ARGS[0] = 'nude_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','topless_nude'
 			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-			
-			act 'Agree (2:00)':gt'foto_shoot','topless_nude'
+			gt'foto_shoot','topless_nude'
 		end
 	end
 	
 	act 'Full nude':
 		$modelfoto['shoot_type'] = 'full_nude'
 		*clr & cla
+		if modelfoto['fullnude'] >= 3 and modelfoto['erotic'] < 1:gt'foto_events','erotic_persuasion'
 		if pcs_inhib < 60:
 			if modelfoto['fullnude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more of these kinds of pictures of you floating around?'
@@ -459,10 +430,7 @@ if $ARGS[0] = 'nude_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','nude'
 			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-
-			act 'Agree (2:00)':gt'foto_shoot','nude'
+			gt'foto_shoot','nude'
 		end
 	end
 	
@@ -475,7 +443,7 @@ if $ARGS[0] = 'nude_shoot':
 			elseif modelfoto['erotic'] >= 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			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.'			
+				'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 'Look at something else':gt 'foto_shoot','model'
@@ -492,10 +460,7 @@ if $ARGS[0] = 'nude_shoot':
 				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','erotic'
 			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-
-			act 'Agree (2:00)':gt'foto_shoot','erotic'
+			gt'foto_shoot','erotic'
 		end
 	end
 end
@@ -511,31 +476,48 @@ if $ARGS[0] = 'fitness_shoot':
 	'<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_shoot','model'
-
-		act 'Agree (2:00)':gt'foto_shoot','sportswear'
+		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.'
+			cla & *clr
+			*nl
+			' 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.'
+			if pcs_inhib > 10:
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Look at something else':gt 'foto_shoot','model'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','sports_underwear'
+			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-
-			act 'Agree (2:00)':gt'foto_shoot','sports_underwear'
+			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.'
+			cla & *clr
+			*nl
+			' 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.'
+			if pcs_inhib > 30:
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'self', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Look at something else':gt 'foto_shoot','model'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','fitness_artistic_nude'
+			end
 		else
-			cla
-			act 'Look at something else':gt 'foto_shoot','model'
-
-			act 'Agree (2:00)':gt'foto_shoot','fitness_artistic_nude'
+			gt'foto_shoot','fitness_artistic_nude'
 		end
 	end
 end
@@ -760,7 +742,7 @@ if $ARGS[0] = 'topless_nude':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,79)>>.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.'			
+	'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
@@ -847,7 +829,7 @@ if $ARGS[0] = 'sportswear':
 	mdlng_exp += rand(2,4)
 	gs 'fame', 'city', 'modelling', 'small'
 	gs 'stat'
-	if bodset = 2 and salocatnow >= 2:
+	if rand(0,1) = 0:
 		*clr & cla
 		modelpayfin += 300
 		gs 'stat'
@@ -858,7 +840,7 @@ if $ARGS[0] = 'sportswear':
 	*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.'    
+	'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
@@ -876,7 +858,7 @@ if $ARGS[0] = 'sports_underwear':
 	mdlng_exp += rand(3,6)
 	if pcs_inhib < 50:inhib_exp += 1
 	gs 'stat'
-	if bodset = 2 and salocatnow >= 2:
+	if rand(0,1) = 0:
 		*clr & cla
 		modelpayfin += 325
 		gs 'stat'
@@ -903,7 +885,7 @@ if $ARGS[0] = 'fitness_artistic_nude':
 	gs 'fame', 'city', 'modelling', 'small'
 	inhib_exp += 2
 	gs 'stat'	
-	if bodset = 2 and salocatnow >= 2:
+	if rand(0,1) = 0:
 		*clr & cla
 		modelpayfin += 600
 		gs 'stat'