Browse Source

[changed] Some functions removed as not useful

Kevin_Smarts 2 years ago
parent
commit
ddbfb93a19

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -1517,7 +1517,7 @@ $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 func('uniutil', 'diploma', 'obtained'):
+	if university['diploma'] > 0:
 		'You already have a Diploma'
 	else
 		'<a href="exec:gs ''uniutil'', ''diploma'', ''set_obtained'' & dynamic $cheatmenu[''documents'']">Get Diploma</a>'

+ 4 - 4
locations/city_redlight.qsrc

@@ -89,9 +89,9 @@ if $ARGS[0] = 'city_copy_shop':
 		fakepassport = 0
 		'He looks at you hard before saying in a quiet voice, "A passport with a fake age will cost you 30,000 <b>₽</b>"'
 	end
-	if func('uniutil', 'fake_diploma', 'aware_needed'):
+	if university['fakediplom'] = 2:
 		!!only notify player 1 time after events triggered
-		gs 'uniutil', 'fake_diploma', 'reset'
+		university['fakediplom'] = 0
 		'He tells you "A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>"'
 	end
 	act 'Leave': gt 'city_redlight', 'start'
@@ -110,13 +110,13 @@ if $ARGS[0] = 'city_copy_shop':
 			act 'Buy fake passport (<font color="red">30,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to buy the fake passport.</font>'
 		end
 	end
-	if func('uniutil', 'appear_to_have_graduated') = 0:
+	if university['diploma'] = 0 and university['fakediplom'] = 0:
 		if money => 100000:
 			act 'Buy fake diploma (100,000 <b>₽</b>)':
 				*clr & cla
 				minut += 60
 				money -= 100000
-				gs 'uniutil', 'fake_diploma', 'set_obtained'
+				university['fakediplom'] = 1
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
 				'You bought a fake diploma.'
 				act 'Leave': gt 'city_redlight', 'start'

+ 3 - 3
locations/etoexhib.qsrc

@@ -767,7 +767,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 				'<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 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 func('uniutil', 'appear_to_have_graduated'):
+				if university['diploma'] = 1 or university['fakediplom'] = 1:
 					act 'Pass an interview for a job':
 						cla
 						*clr
@@ -775,7 +775,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>'
-						'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.'
+						'After passing the oral interview, you leave a copy of your '+iif(university['diploma'] > 0, '', 'forged ')+'diploma and other documents with the personnel department, who tell you that you can start working.'
 
 						act 'Become a teacher':
 							cla
@@ -788,7 +788,7 @@ if $ARGS[0] = 'pos19' or $ARGS[0] = '':
 					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'
+					university['fakediplom'] = 2
 				end
 
 				act 'Exit to Hall':gt 'etoexhib', 'pos19'

+ 1 - 1
locations/love.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'mother':
 
 	if (work = 1 or cheatWork = 1) and workKafe = 1:'"I am a waitress in a cafe."'
 	if func('uniutil', 'student', 'enrolled'):'"I study at the university."'
-	if func('uniutil', 'diploma', 'obtained'):'"I graduated from university."'
+	if university['diploma'] > 0:'"I graduated from university."'
 	if work = 0 and cheatWork = 0 and workKafe ! 1:'"I''m unemployed."'
 
 	if modelfoto_nude > 30:

+ 2 - 2
locations/obj_din.qsrc

@@ -667,10 +667,10 @@ if $ARGS[0] = 'stats':
 	end
 	if profiDanceTime > 0: 'You danced <<profiDanceTime>> times professionally.'
 	if SchoolAtestat = 1: 'You have finished school.'
-	if func('uniutil', 'diploma', 'obtained'): 'You graduated.'
+	if university['diploma'] > 0: 'You graduated.'
 	if teachlevel > 0: 'Your credibility as a teacher is <<teachlevel>>'
 	!WD:FORMATING
-	if maxdamage > 0 or stripdancesum > 0 or profiDanceTime > 0 or SchoolAtestat > 0 or func('uniutil', 'diploma', 'obtained') or teachlevel > 0:*nl
+	if maxdamage > 0 or stripdancesum > 0 or profiDanceTime > 0 or SchoolAtestat > 0 or university['diploma'] > 0 or teachlevel > 0:*nl
 
 	'</td><td width="35%" cellspacing="0" cellpadding="0" valign="top">'
 	'<center><b>Sex Statistics</b></center>'