[changed] some stuff in the journal regarding the modelling job

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