Răsfoiți Sursa

[fixed/added] Fixed the second semester so it will work and added exams for it.

bgkjdgbizgblzdgbr 2 ani în urmă
părinte
comite
194f13c1a7

+ 1 - 0
glife.qproj

@@ -988,6 +988,7 @@
 		<Location name="uni_lessons2"/>
 		<Location name="uni_lessonsev1"/>
 		<Location name="uni_exams1"/>
+		<Location name="uni_exams2"/>
 		<Location name="uni_library"/>
 		<Location name="unicoursework"/>
 		<Location name="uniutil"/>

+ 1 - 1
locations/journal.qsrc

@@ -1549,7 +1549,7 @@ if $ARGS[0] = 'uni':
 
 	elseif university['semester_week'] > 0:
 		if university['semester_week'] < 11:
-			'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.'
+			'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
 			'You are in the '+str(university['semester_week'])+'th week of the semester which last 15 weeks.'
 		end

+ 53 - 6
locations/uni_admin.qsrc

@@ -60,6 +60,9 @@ if $ARGS[0] = 'start':
 	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and (storyline ! 1 or SchoolAtestat = 1) and month < 9:
 		act 'Enroll at the University': gt 'uni_admin', 'enrollment'
 	end
+	if university['enrolled_in_semester'] > 0 and university['enrolled_in_semester'] = university['semester_passed'] and university['semeter_passed'] < 8:
+		act 'Enroll in your next semester': gt 'uni_admin', 'enrollment_semester'
+	end
 	!!the if below should only show up if Sveta tried to enroll and didn''t or couldn''t pay for the classes before
 	if university['entrance_information'] = 1 and university['prep_enrolled'] = 0 and university['student'] = 0 and month < 9: gs 'uni_admin', 'prep_pay'
 end
@@ -97,12 +100,12 @@ if $ARGS[0] = 'enrollment':
 					university['enrolled_in_semester'] = 1
 					home_owned[11] = 1
 					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'teaching methods', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'learning theories', 3, 2, 'no', 'no', 1, 12
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'general education', 35
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'teaching methods', 35
-					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories', 35
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'general education 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'teaching methods 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_1', 'learning theories 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'general education 101', 35
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'teaching methods 101', 35
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_1', 'learning theories 101', 35
 					cla
 					'You tell her you would like to pursue a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take. Once the ID is done she hands it over, along with all of your paperwork. You are now officially enrolled as a student at the Saint Petersburg University.'
 					if (day - week) >= 27 and month = 8:
@@ -134,6 +137,50 @@ if $ARGS[0] = 'enrollment':
 	end
 end
 
+if $ARGS[0] = 'enrollment_semester':
+	$sexloc = 'uni_admin'
+	cla & *clr
+	minut += 15
+	gs 'stat'
+	'<center><b><font color="maroon">Enrollment office</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment1.jpg"></center>'
+	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of young people about your age waiting in a side room. You inform them you wish to enroll at the university, they take down your name and ask you to go wait in the waiting room until your name is called. You walk into the other room, smile and nod to the other prospective students and take a seat.'
+	act 'Wait your turn':
+		cla & *clr
+		'<center><b><font color="maroon">Enrollment office</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
+		'You wait until until your name is called by one of the women. She then leads you down a side hall to one of the offices, letting you take a seat and introduce yourself. After a brief discussion the woman takes your information and enters it into the computer.'
+		if 	$university['enrolled_in']= 'teaching_studies':
+			minut += 15
+			'She looks over the information for a bit, filling in some data. Several minutes later she turns to you and smiles, telling you that you since you passed your last semester you can enroll in the '+trim(MID('  first, second, third, fourth, fifth, sixth, seventh, eighth,  ninth,  tenth', (university['enrolled_in_semester']+1)*8,7))+' of the Teaching Studies Program. She gives you the paperwork and you spend some time filling it all out.'
+			act 'Enroll':
+				!!This sets the variables such that the player is enrolled in next semester of the teaching program.
+				university['enrolled_in_semester'] += 1
+				if university['enrolled_in_semester'] = 2:
+					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'general education 102', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'teaching methods 102', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'general education 102', (class['uni_teaching_studies_semester_1_general education 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'teaching methods 102', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 35
+				end
+				cla
+				'You tell her you would like to continue to pursue a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take.'
+				if (day - week) >= 27 and month = 8:
+					university['semester_week'] = 1
+					*nl
+					'She tells you that you enrolled at the last minute, and the classes have already started this week.'
+				end
+				act 'Leave':gt 'uni_admin', 'start'
+!!once we have the framework working i will start working on some elective classes, once we have a couple of them I will add them here.
+					!!act 'Take some elective classes':
+			end
+		end
+	end
+end
+
+
 if $ARGS[0] = 'prep_pay':
 	if money >= 15000:
 		act 'Pay for the preparatory classes 15000<b>₽</b>) (Cash)':

+ 15 - 15
locations/uni_exams1.qsrc

@@ -1,7 +1,7 @@
 # uni_exams1
 !! Exams in this file are first semester exams for general_education, teaching_methods, learning_theories
 
-if $ARGS[0] = 'general_education':
+if $ARGS[0] = 'general_education_101':
 	menu_off = 1
 	*clr & cla
 	uni_period['exam'] = daystart
@@ -15,13 +15,13 @@ if $ARGS[0] = 'general_education':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
 		*clr & cla
 		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
-		class['uni_teaching_studies_semester_1_general education_exam_done'] = 1
+		class['uni_teaching_studies_semester_1_general education 101_exam_done'] = 1
 
-		if class['uni_teaching_studies_semester_1_general education_grade'] < 40:
+		if class['uni_teaching_studies_semester_1_general education 101_grade'] < 40:
 			'You think that you have don horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.'
-		elseif class['uni_teaching_studies_semester_1_general education_grade'] < 70:
+		elseif class['uni_teaching_studies_semester_1_general education 101_grade'] < 70:
 			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_general education_grade'']>> on the exam'
-		elseif class['uni_teaching_studies_semester_1_general education_grade'] < 90:
+		elseif class['uni_teaching_studies_semester_1_general education 101_grade'] < 90:
 			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.'
 		else
 			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.' 
@@ -33,7 +33,7 @@ if $ARGS[0] = 'general_education':
 	end
 end
 
-if $ARGS[0] = 'teaching_methods':
+if $ARGS[0] = 'teaching_methods_101':
 	menu_off = 1
 	*clr & cla
 	uni_period['exam'] = daystart
@@ -47,13 +47,13 @@ if $ARGS[0] = 'teaching_methods':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
 		*clr & cla
 		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
-		class['uni_teaching_studies_semester_1_teaching methods_exam_done'] = 1
+		class['uni_teaching_studies_semester_1_teaching methods 101_exam_done'] = 1
 
-		if class['uni_teaching_studies_semester_1_teaching methods_grade'] < 40:
+		if class['uni_teaching_studies_semester_1_teaching methods 101_grade'] < 40:
 			'You think that you have did horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.'
-		elseif class['uni_teaching_studies_semester_1_teaching methods_grade'] < 70:
+		elseif class['uni_teaching_studies_semester_1_teaching methods 101_grade'] < 70:
 			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>> on the exam'
-		elseif class['uni_teaching_studies_semester_1_teaching methods_grade'] < 90:
+		elseif class['uni_teaching_studies_semester_1_teaching methods 101_grade'] < 90:
 			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.'
 		else
 			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.' 
@@ -65,7 +65,7 @@ if $ARGS[0] = 'teaching_methods':
 	end
 end
 
-if $ARGS[0] = 'learning_theories':
+if $ARGS[0] = 'learning_theories_101':
 	menu_off = 1
 	*clr & cla
 	uni_period['exam'] = daystart
@@ -79,13 +79,13 @@ if $ARGS[0] = 'learning_theories':
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
 		*clr & cla
 		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
-		class['uni_teaching_studies_semester_1_learning theories_exam_done'] = 1
+		class['uni_teaching_studies_semester_1_learning theories 101_exam_done'] = 1
 
-		if class['uni_teaching_studies_semester_1_learning theories_grade'] < 40:
+		if class['uni_teaching_studies_semester_1_learning theories 101_grade'] < 40:
 			'You think that you have did horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.'
-		elseif class['uni_teaching_studies_semester_1_learning theories_grade'] < 70:
+		elseif class['uni_teaching_studies_semester_1_learning theories 101_grade'] < 70:
 			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>> on the exam'
-		elseif class['uni_teaching_studies_semester_1_learning theories_grade'] < 90:
+		elseif class['uni_teaching_studies_semester_1_learning theories 101_grade'] < 90:
 			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.'
 		else
 			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.' 

+ 101 - 0
locations/uni_exams2.qsrc

@@ -0,0 +1,101 @@
+# uni_exams2
+!! Exams in this file are first semester exams for general_education, teaching_methods, learning_theories
+
+if $ARGS[0] = 'general_education_102':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat farthest to the right, next to a window. The rest of your classmates walk in one by one. Mr. Kovalyov enters the classroom, and closes the door. Mr. Kovalyov turns to the class and says. "Today is your final exam, I hope you have all payed attention in my class and taken notes. Much of your grade will be decided by this one exam." As he talks he walks around handing out the exams. Once everyone has one he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test, begin."'
+	*nl
+	'You spend all three hours you have taking the exam, doing all the parts you are positive on and then going back to the parts you are less sure of to check them again. Once you are happy with your work, you hand in your exam as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
+		class['uni_teaching_studies_semester_2_general education 102_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_2_general education 102_grade'] < 40:
+			'You think that you have don horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_2_general education 102_grade'] < 70:
+			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_general education_grade'']>> on the exam'
+		elseif class['uni_teaching_studies_semester_2_general education 102_grade'] < 90:
+			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.'
+		else
+			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_general education_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'teaching_methods_102':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one she smiles to each one as they enter. Once everyone is seated you find a exam sitting on the desk waiting for you. "Today is your final exam, if you have payed attention in my class and studied you should have no problem passing this exam. It is a very important exam much of your grade is decided by this one test, showing us what you have learned." She glances to the clock on the wall. "You have three hours to complete the test, begin." Then she takes a seat at her desk.'
+	*nl
+	'You spend all three hours you have taking the exam, doing all the parts you are positive on and then going back to the parts you are less sure of to check them again. Once you are happy with your work, you hand in your exam as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
+		class['uni_teaching_studies_semester_2_teaching methods 102_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_2_teaching methods 102_grade'] < 40:
+			'You think that you have did horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_2_teaching methods 102_grade'] < 70:
+			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>> on the exam'
+		elseif class['uni_teaching_studies_semester_2_teaching methods 102_grade'] < 90:
+			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.'
+		else
+			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_teaching methods_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'psychology_of_a_student_101':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat farthest to the right, next to a window. The rest of your classmates walk in one by one. Mr. Kovalyov enters the classroom, and closes the door. Mr. Kovalyov turns to the class and says. "Today is your final exam, I hope you have all payed attention in my class and studied hard. Much of your grade will be decided by this one exam." As he talks he walks around handing out the exams. Once everyone has one he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test, begin."'
+	*nl
+	'You spend all three hours you have taking the exam, doing all the parts you are positive on and then going back to the parts you are less sure of to check them again. Once you are happy with your work, you hand in your exam as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_1'
+		class['uni_teaching_studies_semester_2_psychology of a student 101_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_2_psychology of a student 101_grade'] < 40:
+			'You think that you have did horrible on the exam and are probably going to fail with <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_2_psychology of a student 101_grade'] < 70:
+			'You think that you did enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>> on the exam'
+		elseif class['uni_teaching_studies_semester_2_psychology of a student 101_grade'] < 90:
+			'You think you did pretty well on the exam, and is going to get an <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.'
+		else
+			'You are sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_1_learning theories_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+--- uni_exams2 ---------------------------------
+

+ 9 - 9
locations/uni_lessons2.qsrc

@@ -7,7 +7,7 @@
 
 if $ARGS[0] = 'general_education_102':
 	menu_off = 1
-	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'general education 102'
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_2', 'general education 102'
 	intel_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
@@ -17,7 +17,7 @@ if $ARGS[0] = 'general_education_102':
 	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'general education 102', pcs_intel
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'general education 102', pcs_intel
 			intel_exp += rand(0,1)
 			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
@@ -26,7 +26,7 @@ if $ARGS[0] = 'general_education_102':
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
 			act 'Ask a question about the lesson':
 				*clr & cla
-				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'general education 102', pcs_chrsm
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'general education 102', pcs_chrsm
 				intel_exp += rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Mr. Kovalyov nods approvingly, happy to see his students engaged in class and trying their best. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
@@ -245,7 +245,7 @@ end
 
 if $ARGS[0] = 'teaching_methods_102':
 	menu_off = 1
-	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'teaching methods 102'
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_2', 'teaching methods 102'
 	intel_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
@@ -256,7 +256,7 @@ if $ARGS[0] = 'teaching_methods_102':
 		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			intel_exp += rand(0,1)
-			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'teaching methods 102', pcs_intel
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'teaching methods 102', pcs_intel
 			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'teaching_methods_102':
 			act 'Ask a question about the lesson':
 				*clr & cla
 				intel_exp += rand(1,2)
-				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'teaching methods', pcs_intel
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'teaching methods', pcs_intel
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
 				'Mr. Pasternak nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
 				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'teaching_methods'
@@ -498,7 +498,7 @@ end
 
 if $ARGS[0] = 'psychology_of_a_student_101':
 	menu_off = 1
-	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'psychology of a student 101'
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_2', 'psychology of a student 101'
 	intel_exp += rand(0,1)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
@@ -509,7 +509,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			intel_exp += rand(0,1)
-			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology of a student 101', pcs_intel
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'psychology of a student 101', pcs_intel
 			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 			act 'Ask a question about the lesson':
 				*clr & cla
 				intel_exp += rand(1,2)
-				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology of a student 101', pcs_intel
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'psychology of a student 101', pcs_intel
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive4.jpg"></center>'
 				'Mrs. Kovalchuk nods approvingly, always happy to see her students engaged in her class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
 				act 'Wait for the end of the lesson': gs 'uni_lessonsev1', 'psychology_of_a_student_101'

+ 256 - 42
locations/uni_programs.qsrc

@@ -19,52 +19,102 @@ if $ARGS[0] = 'uni_period_first':
 	if $university['enrolled_in'] = 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
 			if $ARGS[1] = 'monday':
-				$Result = 'General Education (9:00 to 10:30)'
+				$Result = 'General Education 101 (9:00 to 10:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'General Education (9:00 to 10:30)'
+				$Result = 'General Education 101 (9:00 to 10:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'General Education (9:00 to 10:30)'
+				$Result = 'General Education 101 (9:00 to 10:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Teaching Methods (9:00 to 10:30)'
+				$Result = 'Teaching Methods 101 (9:00 to 10:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your General Education class': 
+				act 'Go to your General Education 101 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'general_education'
+					gt 'uni_lessons1', 'general_education_101'
 				end
 			elseif week = 2:
 				*nl
 				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your General Education class': 
+				act 'Go to your General Education 101 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'general_education'
+					gt 'uni_lessons1', 'general_education_101'
 				end
 			elseif week = 3:
 				*nl
 				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your General Education class': 
+				act 'Go to your General Education 101 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'general_education'
+					gt 'uni_lessons1', 'general_education_101'
 				end
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Teaching Methods class': 
+				act 'Go to your Teaching Methods 101 class': 
 					if hour = 8: minut += 60 - minut
 					if hour = 7: minut += 120 - minut					
 					uni_period['first'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'teaching_methods'
+					gt 'uni_lessons1', 'teaching_methods_101'
+				end
+			end
+		elseif university['enrolled_in_semester'] = 2:
+			if $ARGS[1] = 'monday':
+				$Result = 'General Education 102 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'General Education 102 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'General Education 102 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Teaching Methods 102 (9:00 to 10:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 102 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'general_education_102'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 102 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'general_education_102'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 102 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'general_education_102'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Teaching Methods 102 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'teaching_methods_102'
 				end
 			end
 		end
@@ -77,48 +127,94 @@ if $ARGS[0] = 'uni_period_second':
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
 			if $ARGS[1] = 'monday':
-				$Result = 'Teaching Methods (11:00 to 12:30)'
+				$Result = 'Teaching Methods 101 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'Lerning Theories 101 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Teaching Methods 101 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Lerning Theories 101 (11:00 to 12:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Teaching Methods 101 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons1', 'teaching_methods_101'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Lerning Theories 101 Class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons1', 'learning_theories_101'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Teaching Methods 101 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons1', 'teaching_methods_101'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Lerning Theories 101 Class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons1', 'learning_theories_101'
+				end
+			end
+		elseif university['enrolled_in_semester'] = 2:
+			if $ARGS[1] = 'monday':
+				$Result = 'Teaching Methods 102 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'tuesday':
-				$Result = 'Lerning Theories (11:00 to 12:30)'
+				$Result = 'Phsychology of a Student 101 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Teaching Methods (11:00 to 12:30)'
+				$Result = 'Teaching Methods 102 (11:00 to 12:30)'
 			elseif $ARGS[1] = 'thursday':
-				$Result = 'Lerning Theories (11:00 to 12:30)'
+				$Result = 'Phsychology of a Student 101 (11:00 to 12:30)'
 			elseif week = 1: 
 				*nl
 				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Teaching Methods class': 
+				act 'Go to your Teaching Methods 102 class': 
 					if hour = 10: minut += 60 - minut
 					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'teaching_methods'
+					gt 'uni_lessons2', 'teaching_methods_102'
 				end
 			elseif week = 2:
 				*nl
 				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories Class': 
+				act 'Go to your Phsychology of a Student 101 Class': 
 					if hour = 10: minut += 60 - minut				
 					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'learning_theories'
+					gt 'uni_lessons2', 'psychology_of_a_student_101'
 				end
 			elseif week = 3:
 				*nl
 				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Teaching Methods class': 
+				act 'Go to your Teaching Methods 102 class': 
 					if hour = 10: minut += 60 - minut				
 					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'teaching_methods'
+					gt 'uni_lessons2', 'teaching_methods_102'
 				end
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 11:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories Class': 
+				act 'Go to your Phsychology of a Student 101 Class': 
 					if hour = 10: minut += 60 - minut
 					uni_period['second'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'learning_theories'
+					gt 'uni_lessons2', 'psychology_of_a_student_101'
 				end
 			end
 		end
@@ -135,7 +231,7 @@ if $ARGS[0] = 'uni_period_third':
 			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
 				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Lerning Theories (13:15 to 14:45)'
+				$Result = 'Lerning Theories 101 (13:15 to 14:45)'
 			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
 				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
 			elseif week = 1 and $university['elective1'] ! '': 
@@ -159,12 +255,59 @@ if $ARGS[0] = 'uni_period_third':
 			elseif week = 3:
 				*nl
 				'Your next class will start at 13:15. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories Class': 
+				act 'Go to your Lerning Theories 101 Class': 
 					if hour = 12: minut += 75 - minut
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
 					gs 'stat'
-					gt 'uni_lessons1', 'learning_theories'
+					gt 'uni_lessons1', 'learning_theories_101'
+				end
+			elseif week = 4 and $university['elective3'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 3': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			end
+		elseif university['enrolled_in_semester'] = 2:
+			if $ARGS[1] = 'monday' and $university['elective1'] ! '':
+				$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
+				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Phsychology of a Student 101 (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
+				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+			elseif week = 1 and $university['elective1'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 1': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 2 and $university['elective2'] ! '':
+				!!*nl
+				!!'Your next class will start at 13:15'
+				!!act 'Go to your elective clas 2': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 13:15. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Phsychology of a Student 101 Class': 
+					if hour = 12: minut += 75 - minut
+					if hour = 13 and minut < 15: minut += 15 - minut
+					uni_period['third'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'psychology_of_a_student_101'
 				end
 			elseif week = 4 and $university['elective3'] ! '': 
 				!!*nl
@@ -189,33 +332,33 @@ if $ARGS[0] = 'exam':
 			if $ARGS[1] = 'schedule':
 				if university['exam_week'] = 1: 
 					if week < 4 or (week = 4 and hour < 9):
-						$Result = 'General Education Exam (9:00 to 12:00) Thursday this week. Teaching Methods Exam (9:00 to 12:00) Monday next week. Lerning Theories Exam (9:00 to 12:00) Thursday next week.'
+						$Result = 'General Education 101 Exam (9:00 to 12:00) Thursday this week. Teaching Methods 101 Exam (9:00 to 12:00) Monday next week. Lerning Theories 101 Exam (9:00 to 12:00) Thursday next week.'
 					else	
-						$Result = 'Teaching Methods Exam (9:00 to 12:00) Tuesday next week. Learning Theories Exam (9:00 to 12:00) Thursday next week.'
+						$Result = 'Teaching Methods 101 Exam (9:00 to 12:00) Tuesday next week. Learning Theories 101 Exam (9:00 to 12:00) Thursday next week.'
 					end
 				elseif university['exam_week'] = 2: 
 					if week < 2 or (week = 2 and hour < 9):
-						$Result = 'Teaching Methods Exam (9:00 to 12:00) Tuesday this week. Lerning Theories Exam (9:00 to 12:00) Thursday this week.'
+						$Result = 'Teaching Methods 101 Exam (9:00 to 12:00) Tuesday this week. Lerning Theories 101 Exam (9:00 to 12:00) Thursday this week.'
 					elseif week < 4 or (week = 4 and hour < 9):
-						$Result = 'Learning Theories Exam (9:00 to 12:00) Thursday this week.'
+						$Result = 'Learning Theories 101 Exam (9:00 to 12:00) Thursday this week.'
 					else
 						$Result = 'All your exams are over. Now it is just waiting to the grade is announced.'
 					end
 				end
 			elseif $ARGS[1] = 'is_over':
-				if $ARGS[2] = 'general education':
+				if $ARGS[2] = 'general education 101':
 					if university['exam_week'] = 1 and (week < 4 or (week = 4 and hour < 9)):
 						Result = 0
 					else	
 						Result = 1
 					end
-				elseif $ARGS[2] = 'teaching methods':
+				elseif $ARGS[2] = 'teaching methods 101':
 					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 2 or (week = 2 and hour < 9))):	
 						Result = 0
 					else	
 						Result = 1
 					end
-				elseif $ARGS[2] = 'learning theories':
+				elseif $ARGS[2] = 'learning theories 101':
 					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 4 or (week = 4 and hour < 9))):
 						Result = 0
 					else	
@@ -225,36 +368,107 @@ if $ARGS[0] = 'exam':
 			elseif university['exam_week'] = 1: 
 				if week = 4:
 					*nl
-					'Your General Education exam will start at 9:00 today. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-					act 'Go to your General Education exam': 
+					'Your General Education 101 exam will start at 9:00 today. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your General Education 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
 						gs 'stat'
-						gt 'uni_exams1', 'general_education'
+						gt 'uni_exams1', 'general_education_101'
 					end
 				end
 			elseif university['exam_week'] = 2:
 				if week = 2: 
 					*nl
-					'Your Teaching Methods exam will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-					act 'Go to your Teaching Methods exam': 
+					'Your Teaching Methods 101 exam will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Teaching Methods 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
 						gs 'stat'
-						gt 'uni_exams1', 'teaching_methods'
+						gt 'uni_exams1', 'teaching_methods_101'
+					end
+				elseif week = 4: 
+					*nl
+					'Your Lerning Theories 101 exam will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Lerning Theories 101 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams1', 'learning_theories_101'
+					end
+				end
+			end
+		elseif university['enrolled_in_semester'] = 2:
+			if $ARGS[1] = 'schedule':
+				if university['exam_week'] = 1: 
+					if week < 4 or (week = 4 and hour < 9):
+						$Result = 'General Education 102 Exam (9:00 to 12:00) Thursday this week. Teaching Methods 102 Exam (9:00 to 12:00) Monday next week. Phsychology of a Student 101 Exam (9:00 to 12:00) Thursday next week.'
+					else	
+						$Result = 'Teaching Methods 102 Exam (9:00 to 12:00) Tuesday next week. Phsychology of a Student 101  Exam (9:00 to 12:00) Thursday next week.'
+					end
+				elseif university['exam_week'] = 2: 
+					if week < 2 or (week = 2 and hour < 9):
+						$Result = 'Teaching Methods 102 Exam (9:00 to 12:00) Tuesday this week. Phsychology of a Student 101 Exam (9:00 to 12:00) Thursday this week.'
+					elseif week < 4 or (week = 4 and hour < 9):
+						$Result = 'Phsychology of a Student 101 Exam (9:00 to 12:00) Thursday this week.'
+					else
+						$Result = 'All your exams are over. Now it is just waiting to the grade is announced.'
+					end
+				end
+			elseif $ARGS[1] = 'is_over':
+				if $ARGS[2] = 'general education 102':
+					if university['exam_week'] = 1 and (week < 4 or (week = 4 and hour < 9)):
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'teaching methods 102':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 2 or (week = 2 and hour < 9))):	
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'Phsychology of a Student 101':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 4 or (week = 4 and hour < 9))):
+						Result = 0
+					else	
+						Result = 1
+					end
+				end
+			elseif university['exam_week'] = 1: 
+				if week = 4:
+					*nl
+					'Your General Education 102 exam will start at 9:00 today. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your General Education 102 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams2', 'general_education_102'
+					end
+				end
+			elseif university['exam_week'] = 2:
+				if week = 2: 
+					*nl
+					'Your Teaching Methods 102 exam will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Teaching Methods exam 102': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams2', 'teaching_methods_102'
 					end
 				elseif week = 4: 
 					*nl
 					'Your Lerning Theories exam will start at 9:00. You can go to it now or go do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-					act 'Go to your Lerning Theories exam': 
+					act 'Go to your Phsychology of a Student 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
 						gs 'stat'
-						gt 'uni_exams1', 'learning_theories'
+						gt 'uni_exams2', 'phsychology_of_a_student_101'
 					end
 				end
 			end
 		end
+
+
 	end
 end