[fixed] Prep courses not counted dur to mix of new and old variables

locations/uni_admin.qsrc

@@ -183,10 +183,10 @@ if $ARGS[0] = 'take_test':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'
 	'You enter the exam room and take your seat. A professor comes out and talks over all the different parts of the exam you will be taking and discusses what is required to pass. Once that is done he passes out the test, then starts the clock. You have one hour to complete the test.'
 !!this is a copy of the old stuff, the code will need to be completely rewritten not sure how we will do it. I assume it will take intel and pav school grades into account? don''t know
-	if pcs_intel >= 100 and func('uniutil', 'attendance', 'is_ok') and func('uniutil', 'assignments_done', 'did_min_num'):
+	if pcs_intel +university['prep_counter'] >= 100:
 		university['entrance_exam_passed'] = 1
 		'You completed the entrance examination, passing it with a perfect score.'
-	elseif (pcs_intel >= 80 or func('uniutil', 'attendance', 'is_ok')) and func('uniutil', 'assignments_done', 'did_min_num'):
+	elseif pcs_intel + university['prep_counter'] >= 80:
 		university['entrance_exam_passed'] = 1
 		'You completed the entrance examination, passing it.'
 	else

locations/uniutil.qsrc

@@ -9,30 +9,6 @@ if $ARGS[0] = 'prepclass':
 		RESULT = 15000
 	end
 
-	if $ARGS[1] = 'closing_hour':
-		RESULT = 21
-	end
-
-	if $ARGS[1] = 'is_enrolled':
-		RESULT = prepclassstats['enrolled'] = 1
-	end
-
-	if $ARGS[1] = 'set_enrolled':
-		prepclassstats['enrolled'] = ARGS[2]
-	end
-
-	if $ARGS[1] = 'count':
-		RESULT = prepclassstats['count']
-	end
-
-	if $ARGS[1] = 'set_count':
-		prepclassstats['count'] = ARGS[2]
-	end
-
-	if $ARGS[1] = 'update_count':
-		gs 'uniutil', 'prepclass', 'set_count', func('uniutil', 'prepclass', 'count') + 1
-	end
-
 	if $ARGS[1] = 'enroll':
 		money -= func('uniutil', 'prepclass', 'cost')
 		gs 'uniutil', 'prepclass', 'set_enrolled', 1
@@ -50,28 +26,6 @@ if $ARGS[0] = 'prepclass':
 	if $ARGS[1] = 'offered_today':
 		RESULT = func('uniutil', 'entrance_exam', 'offered_this_month') and week < 6
 	end
-
-	if $ARGS[1] = 'in_session':
-		RESULT = func('uniutil', 'prepclass', 'offered_today') and hour < func('uniutil', 'prepclass', 'closing_hour')
-	end
-end
-
-if $ARGS[0] = 'entrance_exam':
-	if $ARGS[1] = 'month':
-		RESULT = 8
-	end
-
-	if $ARGS[1] = 'offered_today':
-		RESULT = month = func('uniutil', 'entrance_exam', 'month')
-	end
-
-	if $ARGS[1] = 'is_passed':
-		RESULT = pcs_intel + func('uniutil', 'prepclass', 'count') >= 60
-	end
-
-	if $ARGS[1] = 'print_month':
-		$RESULT = $monthName[func('uniutil', 'entrance_exam', 'month')]
-	end
 end
 
 !! The legacy vars are the vars used by the university before the vars were largely consolidated into