[fixed] the special job list always being available even if there is no work

[fixed] bad timing for special modelling event
[changed] doing a certain shoot ruins your make up afterwards

locations/foto_events.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'skill':
 		gt'foto_events','pool2'
 !!	elseif mdlng_skill_event = 4:
 !!		gt'foto_events','runway1'
-	elseif mdlng_skill_event = 4 and daystage < 4 and daystage > 2:
+	elseif mdlng_skill_event = 4 and daystage = 3:
 		gt'foto_events','runway2'
 	elseif mdlng_skill_event = 5:
 		gt'foto_events','wet'
@@ -965,16 +965,16 @@ if $ARGS[0] = 'special':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"Hey!" you call out to one of the studio managers. "Looking for some more work, any special jobs still available today?"'
 	act'Return to the main floor':gt'foto','studio'
-	if specialjob1 < 95 and specialjob2 < 95 and specialjob3 < 95 and specialjob4 < 95 and specialjob5 < 95 and specialjob6 < 95 and (specialjob7 < 95 and city_kickboxing >=30 and pcs_inhib >= 45) and (specialjob8 < 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+	if specialjob1 > 95 or specialjob2 > 95 or specialjob3 > 95 or specialjob4 > 95 or specialjob5 > 95 or specialjob6 > 95 or (specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45) or (specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
+		act'Look at the list':gt 'foto_events','list'
+	else
 		no_job_reason = rand(1,2)
 		if no_job_reason = 1:
 			'"Sorry <<$pcs_firstname>>, we don''t have anything today. Check in again tomorrow, maybe there''ll be something for you."'
 		else
 			'"Sorry <<$pcs_firstname>>, we already assigned all the requests we had today to other girls. Got none left for you. Check in again tomorrow, maybe there''ll be something for you."'
 		end
-	else
-		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
-		act'Look at the list':gt 'foto_events','list'
 	end
 end
 if $ARGS[0] = 'list':
@@ -986,14 +986,14 @@ 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_events'',''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_events'',''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_events'',''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_events'',''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>'
 end
@@ -2212,6 +2212,7 @@ if $ARGS[0] = 'wet':
 							modelfoto_nip += 1
 							modelfoto_topless += 1
 							modelfoto_nude += 1
+							if pcs_makeup > 1:pcs_makeup = 0
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4