[changed] wrapped all usages of diplom and fakediplom in calls to uniutil. made it so that obtaining the real diploma makes the player no longer aware they need a fake diploma. fixed a small number of typos in the text near this change in etoexib

locations/Cheatmenu_din.qsrc

@@ -1443,8 +1443,11 @@ $cheatmenu['documents'] = {
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
 	if storyline = 1 and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
-	if diplom = 0:'<a href="exec:diplom = 1 & dynamic $cheatmenu[''documents'']">Get Diploma</a>'
-	if diplom = 1:'You already have a Diploma'
+	if func('uniutil', 'diploma', 'obtained'):
+		'You already have a Diploma'
+	else:
+		'<a href="exec:gs ''uniutil'', ''diploma'', ''set_obtained'' & dynamic $cheatmenu[''documents'']">Get Diploma</a>'
+	end
 	if secrdiplom = 0:'<a href="exec:secrdiplom = 1 & dynamic $cheatmenu[''documents'']">Get Secretarial Diploma</a>'
 	if secrdiplom = 1:'You already have a Secretarial Diploma'
 	if masseuse['certification'] < 10:'<a href="exec:masseuse[''certification''] = 10 & dynamic $cheatmenu[''documents'']">Get Masseuse Certificate</a>'

locations/city_industrial_train.qsrc

@@ -57,7 +57,9 @@ if $ARGS[0] = 'outside':
 	if rand(1,100) > 70:
 		'You see a <a href="exec:gt ''etoexhib'',''pos54''">suspicious character</a>.'
 		!fakes use 2 for aware of need for, 1 for have, otherwise 0
-		if fakepassport = 2 or fakediplom = 2: 'When you pass by the suspicious character, he whispers to you: "I have what you want, miss"'
+		if fakepassport = 2 or func('uniutil', 'fake_diploma', 'aware_needed'):
+			'When you pass by the suspicious character, he whispers to you: "I have what you want, miss"'
+		end
 	end
 
 	act 'Go to the city industrial region': minut += 15 & gt'city_industrial'

locations/etoexhib.qsrc

@@ -767,12 +767,9 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 				gs 'stat'
 				'<center><b><font color="maroon">Personnel department</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_cadr.jpg"></center>'
-				'"Hello!" Welcomes the Human Relations employee. She tells you that they need a certified teacher. Working days are Monday to Saturday from 14.00 to 16.00. The pay is 300 <b>₽</b> per day, plus a room in a hostel. The terms of the contract say that, because of a full salary, at the moment, there is no free meals. There is a strict dress code, it must be business atire. Also it is not recommended for women to have bright makeup or a strong perfume.'
+				'"Hello!" Welcomes the Human Relations employee. She tells you that they need a certified teacher. Working days are Monday to Saturday from 14:00 to 16:00. The pay is 300 <b>₽</b> per day, plus a room in a hostel. The terms of the contract say that, because they pay a full salary, at the moment there are no free meals. There is a strict dress code: business attire is required. Also, it is not recommended for women to have bright makeup or strong perfume.'
 
-				if diplom = 0 and fakediplom < 0:
-					'You are told that you can not take the job without a diploma of higher pedagogical education.'
-					fakediplom = 2
-				elseif diplom = 1 or fakediplom = 1:
+				if func('uniutil', 'appear_to_have_graduated'):
 					act 'Pass an interview for a job':
 						cla
 						*clr
@@ -780,7 +777,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 						gs 'stat'
 						'<center><b><font color="maroon">Human Resource Department</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_cadr.jpg"></center>'
-						'You have passed the oral interview, left a copy of your diploma and other documents to the personnel department, where you are told that you can start working.'
+						'After passing the oral interview, you leave a copy of your '+iif(func('uniutil', 'diploma', 'obtained'), '', 'forged ')+'diploma and other documents with the personnel department, who tell you that you can start working.'
 
 						act 'Become a teacher':
 							cla
@@ -791,6 +788,9 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 							act 'Exit to Hall':gt 'etoexhib', 'pos19'
 						end
 					end
+				else:
+					'You are told that you cannot take the job without a diploma from an institute of higher  education.'
+					gs 'uniutil', 'fake_diploma', 'set_aware_needed'
 				end
 
 				act 'Exit to Hall':gt 'etoexhib', 'pos19'
@@ -1681,19 +1681,18 @@ if $ARGS[0] = 'pos54':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
-	'A suspicious man. He constantly looks around. Occasionally, some people approach him and leave with papers. After looking carefully, you understand, he sells gas station checks and forged documents. It''s possible and you could find something useful.'
+	'A suspicious man. He constantly looks around. Occasionally, some people approach him and leave with papers. After looking carefully, you understand: he sells gas station checks and forged documents. It''s possible you could find something useful.'
 
-	if fakepassport = 2 or fakediplom = 2:
+	if fakepassport = 2:
 		!only notify player 1 time after events triggered
-		if fakepassport = 2:
-			fakepassport = 0
-			'He tells you "A passport with a fake age will cost you 30,000 <b>₽</b>"'
-		end
+		fakepassport = 0
+		'He tells you "A passport with a fake age will cost you 30,000 <b>₽</b>"'
+	end
 
-		if fakediplom = 2:
-			fakediplom = 0
-			'He tells you "A diploma of bachelor degree will cost you 100,000 <b>₽</b>"'
-		end
+	if func('uniutil', 'fake_diploma', 'aware_needed'):
+		!only notify player 1 time after events triggered
+		gs 'uniutil', 'fake_diploma', 'reset'
+		'He tells you "A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>"'
 	end
 
 	act 'Leave': gt 'city_industrial_train', 'outside'
@@ -1716,13 +1715,13 @@ if $ARGS[0] = 'pos54':
 		end
 	end
 
-	if diplom = 0 and fakediplom ! 1:
+	if func('uniutil', 'appear_to_have_graduated') = 0:
 		if money => 100000:
 			act 'Buy fake diploma (100,000 <b>₽</b>)':
 				*clr & cla
 				minut += 10
 				money -= 100000
-				fakediplom = 1
+				gs 'uniutil', 'fake_diploma', 'set_obtained'
 
 				'<center><img <<$set_imgh>> src="images/locations/shared/train/spy.jpg"></center>'
 				'You bought a fake diploma.'

locations/love.qsrc

@@ -30,8 +30,8 @@ if $ARGS[0] = 'mother':
 	'<<$loverdesc[lover_number]>> pulls out a chair for you and you sit down. His mother places herself in front of the two of you. She looks at you with disgust in her eyes, looking like an overgrown insect, clearly thinking you are not a girl for her son. "So, darling, what do you do for a living?"'
 
 	if (work = 1 or cheatWork = 1) and workKafe = 1:'"I am a waitress in a cafe."'
-	if func('uniutil', 'student', 'enrolled') and diplom = 0:'"I study at the university."'
-	if diplom = 1:'"I graduated from university."'
+	if func('uniutil', 'student', 'enrolled'):'"I study at the university."'
+	if func('uniutil', 'diploma', 'obtained'):'"I graduated from university."'
 	if work = 0 and cheatWork = 0 and workKafe ! 1:'"I''m unemployed."'
 
 	if modelfoto_nude > 30:

locations/obj_din.qsrc

@@ -631,16 +631,16 @@ if $ARGS[0] = 'stats':
 	if stripdancesum > 0 and hidden_stripdancesum = 0:
 		'You have danced <<stripdancesum>> times in the stripclub'
 	elseif stripdancesum = 0 and hidden_stripdancesum > 0:
-		'You have danced <<hidden_stripdancesum>> times in the stripclub, but you do nor remember it'
+		'You have danced <<hidden_stripdancesum>> times in the stripclub, but you do not remember it'
 	elseif stripdancesum > 0 and hidden_stripdancesum > 0:
 		'You have danced <<stripdancesum+hidden_stripdancesum>> times in the stripclub, but you only remember <<stripdancesum>> times'
 	end
 	if profiDanceTime > 0: 'You danced <<profiDanceTime>> times professionally.'
 	if SchoolAtestat = 1: 'You have finished school.'
-	if diplom = 1: 'You graduated.'
+	if func('uniutil', 'diploma', 'obtained'): 'You graduated.'
 	if teachlevel > 0: 'Your credibility as a teacher is <<teachlevel>>'
 	!WD:FORMATING
-	if (maxdamage + stripdancesum + profiDanceTime + SchoolAtestat + diplom + teachlevel) > 0:*nl
+	if maxdamage > 0 or stripdancesum > 0 or profiDanceTime > 0 or SchoolAtestat > 0 or func('uniutil', 'diploma', 'obtained') or teachlevel > 0:*nl
 
 	'</td><td width="35%" cellspacing="0" cellpadding="0" valign="top">'
 	'<center><b>Sex Statistics</b></center>'

locations/uniutil.qsrc

@@ -1,7 +1,7 @@
 # uniutil
 
 if $ARGS[0] = 'eligible_for_university':
-	RESULT = func('uniutil', 'student', 'status') = 0 and func('uniutil', 'student', 'graduated') = 0 and (age >= 17 or fakepassport = 1)
+	RESULT = func('uniutil', 'student', 'status') = 0 and func('uniutil', 'diploma', 'obtained') = 0 and (age >= 17 or fakepassport = 1)
 end
 
 if $ARGS[0] = 'prepclass':
@@ -222,7 +222,7 @@ if $ARGS[0] = 'student':
 			gs 'uniutil', 'student', 'set_status', -1
 		elseif func('uniutil', 'check_semester_vs_date') < 0:
 			gs 'uniutil', 'student', 'unenroll'
-			sgs 'uniutil', 'student', 'set_status', -2
+			gs 'uniutil', 'student', 'set_status', -2
 		else:
 			gs 'uniutil', 'student', 'unenroll'
 			gs 'uniutil', 'student', 'set_status', -3
@@ -231,11 +231,7 @@ if $ARGS[0] = 'student':
 
 	if $ARGS[1] = 'graduate':
 		gs 'uniutil', 'student', 'unenroll'
-		diplom = 1
-	end
-
-	if $ARGS[1] = 'graduated':
-		RESULT = diplom > 0
+		gs 'uniutil', 'diploma', 'set_obtained'
 	end
 
 	if $ARGS[1] = 'expelled_for_failing':
@@ -263,6 +259,61 @@ if $ARGS[0] = 'student':
 	end
 end
 
+if $ARGS[0] = 'diploma':
+	if $ARGS[1] = 'get':
+		RESULT = diplom
+	end
+
+	if $ARGS[1] = 'set':
+		diplom = ARGS[2]
+	end
+
+	if $ARGS[1] = 'set_obtained':
+		gs 'uniutil', 'diploma', 'set', 1
+		if func('uniutil', 'fake_diploma', 'aware_needed'):
+			gs 'uniutil', 'fake_diploma', 'reset'
+		end
+	end
+
+	if $ARGS[1] = 'obtained':
+		RESULT = func('uniutil', 'diploma', 'get') > 0
+	end
+end
+
+if $ARGS[0] = 'fake_diploma':
+	if $ARGS[1] = 'get':
+		RESULT = fakediplom
+	end
+
+	if $ARGS[1] = 'set':
+		fakediplom = ARGS[2]
+	end
+
+	if $ARGS[1] = 'set_aware_needed':
+		gs 'uniutil', 'fake_diploma', 'set', 2
+	end
+
+	if $ARGS[1] = 'set_obtained':
+		gs 'uniutil', 'fake_diploma', 'set', 1
+	end
+
+	if $ARGS[1] = 'reset':
+		gs 'uniutil', 'fake_diploma', 'set', 0
+	end
+
+	if $ARGS[1] = 'aware_needed':
+		RESULT = func('uniutil', 'student', 'get_fake_diploma_status') = 2
+	end
+
+	if $ARGS[1] = 'obtained':
+		RESULT = func('uniutil', 'student', 'get_fake_diploma_status') = 1
+	end
+end
+
+$ARGS[0] = 'appear_to_have_graduated':
+	RESULT = func('uniutil', 'diploma', 'obtained') or func('uniutil', 'fake_diploma', 'obtained')
+end
+
 if $ARGS[0] = 'attendance':
 	if $ARGS[1] = 'get':
 		RESULT = unisemestrstats['lectures_attendad']

locations/univer.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	
 	func('uniutil', 'semester', 'print_all_months')
 
-	if func('uniutil', 'student', 'graduated'):
+	if func('uniutil', 'diploma', 'obtained'):
 		'You have graduated from the University.'
 	elseif func('uniutil', 'student', 'expelled_for_failing'):
 		'You have been expelled from the University for failing your exams.'