Merge remote-tracking branch 'julzor/master'

locations/gskver.qsrc

@@ -98,11 +98,11 @@ if $ARGS[0] = 'start':
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theater</a> in the park. It only has a single screen.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pavcommercial''">commercial</a> the other to the <a href="exec:minut += 5 & gt ''pavresidential''">residential</a> area.'
-	if ((month > 7 and day > 20) or month = 9 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 0: 
+	if ((month > 7 and day > 20) or (month = 9 and day < 16)) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 0: 
 		'<br>You overhear someone speaking in front of a crowd. The crowd is quite rowdy, with lots of yelling and clapping throughout the <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_1''">meeting</a>.'
-	elseif ((month > 8 and day > 20) or month = 10 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 1 and alb_father_day < daystart:
+	elseif ((month > 8 and day > 20) or (month = 10 and day < 16)) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 1 and alb_father_day < daystart:
 		'Once again a large crowd has gathered in the town center. You can hear Albina''s father holding a public <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_2''">meeting</a>.'
-	elseif ((month > 9 and day > 20) or month = 11 and day < 16) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 2 and alb_father_day < daystart:
+	elseif ((month > 9 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and alb_father_meeting = 2 and alb_father_day < daystart:
 		'By this time you''re well aware that it''s Albina''s father that is holding a <a href="exec: minut += 2 & gt ''gskver'', ''alb_father_meeting_3''">meeting</a>, this time though they have erected a big stage.'
 	end
 	

locations/journal.qsrc

@@ -48,12 +48,13 @@ if $ARGS[0] = 'records':
 	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as pornographic actress under the name <<$pfname>>')
 	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, working with the homeless. Working hours are from 9 to 17, Saturday and Sunday.')
+	if model > 0: $tab_text += dyneval($NoteBookLine,'You are a model working at ''Aphrodite Photography'' in St. Petersburg.')
 	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
-		$tab_text += '<BR><b>You have no more modeling jobs available this week.</b>'
+		$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:
-		$tab_text += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
+		$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:
-		$tab_text += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+		$tab_text += dyneval($NoteBookLine,'You can get paid for 2 modeling jobs this week.')
 	end
 	if pornstack > 0:
 		porndays = 0
@@ -62,29 +63,27 @@ if $ARGS[0] = 'records':
 	end
 	if pornstack > 0 and pfilmday[0] = 0:
 		if pfilmday[1] = 0:
-			$tab_text += '<br><b>You will star in another porno in <<porndays>> days.</b>'
+			$tab_text += dyneval($NoteBookLine,'<br><b>You will star in another porno in <<porndays>> days.</b>')
 		else
-			$tab_text += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
+			$tab_text += dyneval($NoteBookLine,'<br><b>You have a porno shoot scheduled tomorrow.</b>')
 		end
 	end
-	if pfilmday[0] > 0:
-		if pornnow = 1:
-			$tab_text += '<br><b>You are at a porn shooting.</b>'
-		else
-			if hour < 11: $tab_text += '<br><b>You are expected in the porno studio at 10:00.</b>'
-			if hour >= 11 and hour < 13: $tab_text += '<br><b>You should be at the porno studio, shooting!</b>'
-			if hour >= 13: $tab_text += '<br><b>You missed a scheduled porno shoot!</b>'
-		end
+	if pfilmday[0] > 0 and hour < 11: 
+		$tab_text += dyneval($NoteBookLine,'<br>You are expected in the porno studio at 10:00.')
+	elseif pfilmday[0] > 0 and hour >= 11 and hour < 13: 
+		$tab_text += dyneval($NoteBookLine,'<br>You should be at the porno studio, shooting!')
+	elseif pfilmday[0] > 0 and hour >= 13: 
+		$tab_text += dyneval($NoteBookLine,'<br>You missed a scheduled porno shoot!')
 	end
 	if pornmiss = 1: $tab_text += '<br><b>You missed a scheduled porno shoot!</b>'
 	if prodcosttrue > 0: $tab_text += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
 	if firstkasting > 0 and pfilmNO < 1:
 		if pornstack <= 10:
-			$tab_text += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+			$tab_text += dyneval($NoteBookLine,'<br>You are currently unable to book any more porn shoots at the Porn Studio.')
 		elseif pornstack = 11:
-			$tab_text += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
+			$tab_text += dyneval($NoteBookLine,'<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.')
 		else
-			$tab_text += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
+			$tab_text += dyneval($NoteBookLine,'<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.')
 		end
 	end