Merge remote-tracking branch 'hornguy6/master'

locations/foto_events.qsrc

@@ -940,7 +940,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'"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
-			act'Do the nude shoot':gt'foto_shoot','nude'
+			gs'foto_nude_debut', 'nude_debut_shave_start'
 		end
 	elseif foto_persuade = 1:
 		act'Yes, I''m ready':
@@ -949,7 +949,7 @@ if $ARGS[0] = 'nude_persuasion':
 			'"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
-			act'Do the nude shoot':gt'foto_shoot','nude'
+			gs'foto_nude_debut', 'nude_debut_shave_start'
 		end
 	end
 	act'Wow! Yes!':

locations/foto_nude_debut.qsrc

@@ -11,10 +11,14 @@ if $ARGS[0] = 'nude_debut_memory':
 end
 
 if $ARGS[0] = 'nude_debut_pre':
-	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"You want to do a nude shoot? This would be your first one, won''t it?" the manager asks.'
 	'"Yes," you nod back.'
+	gs'foto_nude_debut', 'nude_debut_shave_start'
+end
+
+if $ARGS[0] = 'nude_debut_shave_start':
+	if pcs_leghair > 3:$temp['model_shave'] = '"And your legs too."'
 	if modelfoto['nude_shave_no'] = 1:
 		if pcs_pubes <= 3:
 			modelfoto['nude_shave_yes'] = 1
@@ -32,19 +36,28 @@ if $ARGS[0] = 'nude_debut_pre':
 		if pcs_pubes > 3:
 			gs'foto_nude_debut', 'nude_debut_shave_options'
 			if pcs_pubes < 10:
-				'"You''ll have to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				if foto_persuade = 5:
+					'"Just one thing. You need to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				else
+					'"You''ll have to shave that stubble off," he says, eyeing the fuzzy patch between your legs. <<$temp[''model_shave'']>>'
+				end
 				act'But I''m growing it out':
 					cla & *nl
 					'"But I''m growing it out," you protest.'
-					'"Start again tomorrow," he shrugs. "It''s your debut. Stubble looks bad. Besides, we have a policy here that all model''s nude debut has to be cleanshaven. Even if I wanted to, it''s not up to me. If you don''t like it, do something else."'
+					'"Start again tomorrow," he shrugs. "It''s your debut. All models must be clean shaven for their nude debut. Even if I wanted to give you a pass, it''s not up to me. Besides, stubble looks bad."'
 					gs'foto_nude_debut', 'nude_debut_shave_options'
 				end
 			elseif pcs_pubes > 3:
-				'"You''ll have to shave," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				if foto_persuade = 5:
+					'"Just one thing. You need to shave that off first," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				else
+					'"You need to shave that off first," he says, eyeing your pubic hair. <<$temp[''model_shave'']>>'
+				end
+				
 				act'But I like it this way':
 					cla & *nl
 					'"But I like it this way," you protest.'
-					'"Sorry," he shrugs. "It''s your debut. We have a policy here that all model''s nude debut has to be cleanshaven. Even if I wanted to, it''s not up to me. You can start growing it out again tomorrow."'
+					'"Policy," he shrugs. "It''s your debut. All models must be clean shaven for their nude debut. Even if I wanted to give you a pass, it''s not up to me. You can start growing it out again tomorrow."'
 					gs'foto_nude_debut', 'nude_debut_shave_options'
 				end
 			end