Merge remote-tracking branch 'hornguy6/master'

locations/cikl.qsrc

@@ -9,6 +9,10 @@ if masseuse['jobtype'] < 1:
 	masseuse['<<week>>_shift_3'] = 0
 end
 
+if masseuse['jobtype'] > 0 and week = 5 and masseuse['paycheck'] > 0:
+	masseuse['payday'] = 1
+end
+
 if masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0:
 	masseuse['missed_shift2'] = 1
 end

locations/foto.qsrc

@@ -146,33 +146,33 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model < min(city_modelling, 700) and modelfoto_topless > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
-	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and skill_model_event < daystart:gt 'foto_events','skill'
-	if foto['documentary'] >= 95 and $pantyworntype = 'none':gt'foto_model_documentary','1st_documentary'
+	if special_model < min(city_modelling, 700) and modelfoto_topless > 0 and hour < 15 and fame_model_event ! daystart:gt 'foto_events','fame'
+	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and skill_model_event ! daystart:gt 'foto_events','skill'
+	if foto['documentary'] >= 95 and $pantyworntype = 'none' and modelfoto >= foto['documentary_timer']:gt'foto_model_documentary','1st_documentary'
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
 
 	if city_modelling >= 200 and city_modelling < 240:
-		rank = 1
+		model['rank'] = 1
 	elseif city_modelling >= 240 and city_modelling < 280:
-		rank = 2
+		model['rank'] = 2
 	elseif city_modelling >= 280 and city_modelling < 320:
-		rank = 3
+		model['rank'] = 3
 	elseif city_modelling >= 320 and city_modelling < 360:
-		rank = 4
+		model['rank'] = 4
 	elseif city_modelling >= 360 and city_modelling < 400:
-		rank = 5
+		model['rank'] = 5
 	elseif city_modelling >= 400 and city_modelling < 440:
-		rank = 6
+		model['rank'] = 6
 	elseif city_modelling >= 440 and city_modelling < 560:
-		rank = 7
+		model['rank'] = 7
 	elseif city_modelling >= 560 and city_modelling < 620:
-		rank = 8
+		model['rank'] = 8
 	elseif city_modelling >= 620 and city_modelling < 700:
-		rank = 9
+		model['rank'] = 9
 	elseif city_modelling >= 700:
-		rank = 10
+		model['rank'] = 10
 	end
 
 	anastasia_in = rand(0,1)
@@ -255,13 +255,6 @@ if $ARGS[0] = 'studio':
 		end
 	end
 
-	if pfilmNO = 1:
-		menu_off = 1
-		gs 'stat'
-		'"You''re blacklisted, no decent studio will deal with you, goodbye."'
-		act 'Leave': minut += 1 & gt 'city_center'
-	end
-
 	if model['status'] = 1:
 		act 'Leave':
 			*clr & cla

locations/foto_albums.qsrc

@@ -4,25 +4,25 @@ menu_off = 1
 
 if $ARGS[0] = 'model_portraits':
 	
-	if rank = 1:
+	if model['rank'] = 1:
 		gt 'foto_albums','sveta_10'
-	elseif rank = 2:
+	elseif model['rank'] = 2:
 		gt 'foto_albums','sveta_9'
-	elseif rank = 3:
+	elseif model['rank'] = 3:
 		gt 'foto_albums','sveta_8'
-	elseif rank = 4:
+	elseif model['rank'] = 4:
 		gt 'foto_albums','sveta_7'
-	elseif rank = 5:
+	elseif model['rank'] = 5:
 		gt 'foto_albums','sveta_6'
-	elseif rank = 6:
+	elseif model['rank'] = 6:
 		gt 'foto_albums','sveta_5'
-	elseif rank = 7:
+	elseif model['rank'] = 7:
 		gt 'foto_albums','sveta_4'
-	elseif rank = 8:
+	elseif model['rank'] = 8:
 		gt 'foto_albums','sveta_2'
-	elseif rank = 9:
+	elseif model['rank'] = 9:
 		gt 'foto_albums','sveta_3'
-	elseif rank = 10:
+	elseif model['rank'] = 10:
 		gt 'foto_albums','sveta_1'
 	end	
 
@@ -50,68 +50,54 @@ if $ARGS[0] = 'sveta':
 	act 'Presenting: <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/1.jpg"></center>'
-		'<i>My first nude shoot ever! I''m actually pretty impressed with myself. For my first time doing nude modelling, I looked damn sexy!<i>'
 		act 'Waiting For You':
 			*clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/2.jpg"></center>'
-			'<i>Wow, the final product turned out better than I thought it would. It was really windy that day.<i>'
 			act'Six Hundred Roses':
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/3.jpg"></center>'
-				'<i>Oh! The pool shoot! That was so much fun! I was so cold though!<i>'
 				act'Doll':
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/4.jpg"></center>'
-					'<i>That was an interesting one. The photoshop really makes the artistry here doesn''t it?<i>'
 					act'Workout':
 						*clr
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/5.jpg"></center>'
-						'<i>Oh man, I was so sweaty doing this! Although, seeing it from another perspective, I guess this is why boys like to ogle us at the gym.<i>'
-						if rank >= 2:
+						if model['rank'] >= 2:
 							act'Cool Beauty':
 								*clr
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/6.jpg"></center>'
-								'<i>Did they recently add this one? Oh! It must be because I moved up another rank!<i>'
-								if rank >= 3:
+								if model['rank'] >= 3:
 									act'All Eyes On You':
 										*clr
 										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/7.jpg"></center>'
-										'<i>I had no idea my nipples were so visible that shoot...<i>'
-										if rank >= 4:
+										if model['rank'] >= 4:
 											act'Glow':
 												*clr
 												'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/8.jpg"></center>'
-												'<i>I love bedroom shoots. They just feel so cozy.<i>'
-												if rank >= 5:
+												if model['rank'] >= 5:
 													act'Simple and Clean':
 														*clr
 														'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/9.jpg"></center>'
-														'<i>I remember this one. That was a pretty relaxed day.<i>'
-														if rank >= 6:
+														if model['rank'] >= 6:
 															act'Pierce':
 																*clr
 																'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/10.jpg"></center>'
-																'<i>Ohhh, the balcony shoot! I had almost forgotten about this one! My nipples were so cold!<i>'
-																if rank >= Y:
+																if model['rank'] >= Y:
 																	act'Yoko':
 																		*clr
 																		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/11.jpg"></center>'
-																		'<i>Hey, I look pretty cute in glasses.<i>'
-																		if rank >= 8:
+																		if model['rank'] >= 8:
 																			act'Hay Fever':
 																				*clr
 																				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/12.jpg"></center>'
-																				'<i>My Gadukino shoot! I''m glad I got to do one like Mari!<i>'
-																				if rank >= 9:
+																				if model['rank'] >= 9:
 																					act'His Clothes':
 																						*clr
 																						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/13.jpg"></center>'
-																						'<i>I really liked wearing that shirt. Kind of wish I could''ve taken it home with me...<i>'
-																						if rank >= 10:
+																						if model['rank'] >= 10:
 																							act'Confidence':
 																								*clr
 																								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/14.jpg"></center>'
-																								'<i>Yay!! I did it! I''m number 1! Go me! They picked a great pic to commemorate it too!<i>'
 																							end
 																						end
 																					end

locations/foto_model_documentary.qsrc

@@ -151,6 +151,7 @@ if $ARGS[0] = '1st_documentary':
 end
 
 if $ARGS[0] = 'documentary_1':
+	foto['documentary_timer'] = modelfoto + 6
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'You head over to where you were directed and see a group of people standing around several video cameras set up with lights shining on an empty set.'

locations/foto_models.qsrc

@@ -1886,7 +1886,7 @@ if $ARGS[0] = 'krystal_sextalk':
 		*clr
 		if krys_sexlife = 0:krys_sexlife = 1
 		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/12.jpg"></center>'
-		'"Pretty good I''d say. Ben and I probably do it at least, what, four or five times a day? In the morning Ben usually wakes me up with a good pounding. No joke, I''l wake up and he''ll already be balls deep in me. Really gets you out of bed in the morning. My own personal alarm cock. If we have a porn shoot then we''ll fuck on camera. If not, sometimes he drops by the studio for a quickie. Then after work we''ll fuck before dinner. After dinner we usually relax by watching a movie while I give him head. And then one more good night fuck in bed? Sometimes he wakes me up in the night to do it again but I wouldn''t say we do that <i>too</i> often. Maybe twice a week. Oh wait. That''s not five, that''s six."'
+		'"Pretty good I''d say. Ben and I probably do it at least, what, four or five times a day? In the morning Ben usually wakes me up with a good pounding. No joke, I''ll wake up and he''ll already be balls deep in me. Really gets you out of bed in the morning. My own personal alarm cock. If we have a porn shoot then we''ll fuck on camera. If not, sometimes he drops by the studio for a quickie. Then after work we''ll fuck before dinner. After dinner we usually relax by watching a movie while I give him head. And then one more good night fuck in bed? Sometimes he wakes me up in the night to do it again but I wouldn''t say we do that <i>too</i> often. Maybe twice a week. Oh wait. That''s not five, that''s six."'
 	end
 	
 	act'"How do you feel about blowjobs?"':

locations/foto_shoot.qsrc

@@ -637,7 +637,11 @@ if $ARGS[0] = 'sexy':
 	'You dress up in sexy clothes and spend the next two hours posing 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.'
-	act 'Leave':gt 'foto','end'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
 end
 
 if $ARGS[0] = 'transparent':
@@ -828,9 +832,8 @@ if $ARGS[0] = 'erotic':
 	if pcs_inhib < 60:inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,19)>>.jpg"></center>'
 	if $pantyworntype ! 'none':
-		
-	else
 	
+	else
 		'Already naked, you step onto the set and begin the shoot immediately.'
 	end
 	*nl

locations/journal.qsrc

@@ -19,6 +19,7 @@ if $ARGS[0] = 'records':
 	end
 
 	$tab_text += '<center><h2>Housing</h2></center>'
+	
 	if pavSharedAptEnabled = 1:$tab_text += dyneval($NoteBookLine,'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services')
 	if home_owned[1] = 1:$tab_text += dyneval($NoteBookLine,'You rent a two room apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<home_rent[1]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL>></b> days')
 	if home_owned[1] = 2:$tab_text += dyneval($NoteBookLine,'You own a two room apartment in the city residential area. Your utility bills are due on the 25th of each month.')
@@ -29,7 +30,9 @@ if $ARGS[0] = 'records':
 	if home_owned[5] = 1:$tab_text += dyneval($NoteBookLine,'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.')
 	if home_owned[5] = 2:$tab_text += dyneval($NoteBookLine,'You own a block in the city suburbs upon which you are building a house. Your utility bills are due on the 25th of each month.')
 	if home_owned[5] = 3:$tab_text += dyneval($NoteBookLine,'You own an impressive mansion in the suburbs of St. Petersburg. Your utility bills are due on the 25th of each month.')
+	
 	$tab_text += '<center><h2>Work</h2></center>'
+	
 	if workPTU > 2:$tab_text += dyneval($NoteBookLine,'You work as a teacher at the Lycée and your schedule is Mon-Sat, teaching between 14:00 to 16:00. Your salary is 300r/day. The dress code is Office Clothes, Strict. The road from the apartment to the Lyceum takes 2 hours 10 minutes.')
 	if (work = 1 or cheatWork = 1) and workKafe > 0:$tab_text += dyneval($NoteBookLine,'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11:00-12:00 while your working days are: Tuesday, Wednesday, and Thursday. At work, you can receive tips from customers and your wages are received on 25th of each month.')
 	if (work = 1 or cheatWork = 1) and workhosp > 0:$tab_text += dyneval($NoteBookLine,'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on 25th of each month.')
@@ -49,30 +52,30 @@ if $ARGS[0] = 'records':
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.')
 	
-	if model > 0:	
+	if model['status'] > 0:	
 		if modelfoto_erotic > 0:
-			$tab_text += dyneval($NoteBookLine,'You are an erotic model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are an erotic model working at Aphrodite Photography in St. Petersburg.')
 		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:
-			$tab_text += dyneval($NoteBookLine,'You are an artistic nude model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are an artistic nude model working at Aphrodite Photography in St. Petersburg.')
 		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:
-			$tab_text += dyneval($NoteBookLine,'You are a fitness model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are a fitness model working at Aphrodite Photography in St. Petersburg.')
 		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:
-			$tab_text += dyneval($NoteBookLine,'You are a glamour model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are a glamour model working at Aphrodite Photography in St. Petersburg.')
 		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:
-			$tab_text += dyneval($NoteBookLine,'You are a lingerie model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are a lingerie model working at Aphrodite Photography in St. Petersburg.')
 		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:
-			$tab_text += dyneval($NoteBookLine,'You are a fashion model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are a fashion model working at Aphrodite Photography in St. Petersburg.')
 		elseif modelfoto_catalog > 0:
-			$tab_text += dyneval($NoteBookLine,'You are a catalog model working at ''Aphrodite Photography'' in St. Petersburg.')
+			$tab_text += dyneval($NoteBookLine,'You are a catalog model working at Aphrodite Photography in St. Petersburg.')
 		end
 	end
 	*nl
 	
-	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
+	if model['status'] > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
 		$tab_text += dyneval($NoteBookLine,'You have no more modeling jobs available this week.')
-	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
+	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
 		$tab_text += dyneval($NoteBookLine,'You can get paid for 1 more modeling job this week.')
-	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
+	elseif model['status'] > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
 		$tab_text += dyneval($NoteBookLine,'You can get paid for 2 modeling jobs this week.')
 	end
 	*nl

locations/masseuse_work.qsrc

@@ -23,6 +23,7 @@ if $ARGS[0] = 'shift_start':
 		masseuse['<<week>>_shift_3'] = 2
 	end
 	if masseuse['late'] = 1:
+		masseuse['late'] = 0
 		masseuse['weeks_pay'] += 3
 	else
 		masseuse['weeks_pay'] += 4

locations/salon.qsrc

@@ -71,7 +71,9 @@ if $ARGS[0] = 'receptionist':
 		'You walk over to the reception desk to speak to Xian.'
 	end
 	
-	if masseuse['jobtype'] = -6:
+	if hour >= 21:
+		'"It''s after hours <<$pcs_firstname>>. You should go home."'
+	elseif masseuse['jobtype'] = -6:
 		'"Hello, what can I help you with today?"'
 	elseif masseuse['jobtype'] < 0:
 		'"Hello again, <<$pcs_firstname>>. What can I help you with?"'
@@ -81,9 +83,9 @@ if $ARGS[0] = 'receptionist':
 		'"Hello <<$pcs_firstname>>! Are you here to work a shift today? Or are you here for some discount services?"'
 	end
 	act 'Move away':gt 'salon', 'start'
-	
-	act'I''d like to take a look at your services':gt'salon','services'
-	
+	if hour < 21:
+		act'I''d like to take a look at your services':gt'salon','services'
+	end
 	if masseuse['jobtype'] = 0:
 		act'Do you have any job openings?':gt'salon','job_interview1'
 	elseif masseuse['jobtype'] < 0 and masseuse['jobtype'] ! -6:
@@ -92,7 +94,7 @@ if $ARGS[0] = 'receptionist':
 		act'Can I set my schedule for the week?':gt'masseuse_schedule','start'
 		act'I want to change jobs':gt'salon','job_change'
 		act'I''d like to quit':gt'salon','resignation'
-		if masseuse['paycheck'] > 0:
+		if masseuse['payday'] > 0:
 			act'I''m here for my paycheck':gt'salon','payday'
 		end
 	end
@@ -833,14 +835,15 @@ if $ARGS[0] = 'payday':
 	'"Okay!" She opens up a drawer and thumbs through a few different labels before reaching into one and picking up an envelope. She hands it over to you.'
 	if masseuse['shifts_worked'] < masseuse['shifts_required']:
 		'"Hey, you only worked <<masseuse[''shifts_worked'']>> this week. You were supposed to work <<masseuse[''shifts_required'']>>."'
-		'"Sorry," you say, reaching for the envelope "Won''t happen again."'
-		'"Better not," she replies, holding onto the edge of the paper and forcing you to make eye contact. "<<masseuse[''warning'']>> more times and you''re fired."'
+		'"Sorry," you say, reaching for the envelope. "Won''t happen again."'
+		'"Better not." You try to pull the envelope away but Xian holds on tight to it, not budging until you make eye contact. "<<masseuse[''warning'']>> more times and you''re fired."'
+		*nl
 		'She lets go.'
 	elseif masseuse['shifts_worked'] >= masseuse['shifts_required']:
 		masseuse['shifts_worked'] = 0
 		if masseuse['shifts_worked'] > masseuse['shifts_required']:
 			'"By the way, thanks for covering those extra shifts this week <<$pcs_firstname>>! Really helpful for us."'
-			'"No problem, I needed the money," you say, taking the envelope.'
+			'"No problem, I wanted the money," you say, taking the envelope.'
 		end
 	end
 	
@@ -852,6 +855,7 @@ if $ARGS[0] = 'payday':
 	elseif masseuse['jobtype'] > 2:
 		masseuse['sex_money_earned'] += masseuse['paycheck']
 	end
+	masseuse['payday'] = 0
 	masseuse['weeks_pay'] = 0
 	masseuse['paycheck'] = 0
 	act'Leave':gt'salon','start'