[fixed] More uni bugs.

locations/journal.qsrc

@@ -465,10 +465,10 @@ if $ARGS[0] = 'uni':
 
 	j = 1
 	:semester_loop
-	if university['semester_passed'] = j:
+	if university['semester_passed'] >= j:
 		gs 'grades', 'assing_grade_description', 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>'
 		*nl
-		'You passed the'+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', i*8-7,7))+' semester with the following grades:'
+		'You passed the'+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', j*8-7,7))+' semester with the following grades:'
 		k = 0
 		:class_loop
 		if $class_list_institution[k] = 'uni_<<$university[''enrolled_in'']>>_semester_<<j>>':
@@ -481,10 +481,12 @@ if $ARGS[0] = 'uni':
 	j += 1
 	if j < 8: jump 'semester_loop'
 	killvar 'j'
-
+	
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
+		*nl
 		'You need to register for your next semester at the university administration'
 	elseif university['semester_week'] <= 0 and university['exam_week'] = 0:
+		*nl
 		'You currently have a break between semesters.'
 		if university['semester_week'] = -1:
 			'The next semester will start next week'
@@ -499,8 +501,10 @@ if $ARGS[0] = 'uni':
 
 	elseif university['semester_week'] > 0:
 		if university['semester_week'] < 11:
+			*nl
 			'You are in the '+trim(MID('first, second, third, fourth, fifth, sixth, seventh, eighth, ninth, tenth', university['semester_week']*8-7,7))+' week of the semester, which last 15 weeks.'
 		else
+			*nl
 			'You are in the '+str(university['semester_week'])+'th week of the semester which last 15 weeks.'
 		end
 
@@ -513,7 +517,7 @@ if $ARGS[0] = 'uni':
 
 		'<center><h2>Grades</h2></center>'
 
-		gs 'grades', 'assing_grade_description', $university['enrolled_in']
+		gs 'grades', 'assing_grade_description',  'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
 
 		j = 0
 		:grade_loop
@@ -535,6 +539,7 @@ if $ARGS[0] = 'uni':
 		killvar 'j'
 
 	elseif university['exam_week'] > 0:
+		*nl
 		'You are in the '+iif(university['exam_week'] = 1,'first','second')+' of the two weeks of exams. '+func('uni_programs', 'exam', 'schedule')
 		*nl
 		j = 0

locations/uni_admin.qsrc

@@ -173,7 +173,7 @@ if $ARGS[0] = 'enrollment_semester':
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'general education 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'assessment 201', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'learning theories 201', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general_education_201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general education 201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'assessment 201', 35
 				elseif university['enrolled_in_semester'] = 4: