[Added/fixed] You can now select electives on uni starts, plus some cleen up of the uni_admin file.

locations/intro_uni.qsrc

@@ -111,11 +111,47 @@ if $ARGS[0] = 'degree_choice':
 		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
-		!!gt 'intro_uni', 'elective_choice'
-		gt 'intro_uni', 'dorm_intro'
+		gt 'intro_uni', 'select_electives'
 	end
 end
 
+if $ARGS[0] = 'select_electives':
+	!! Choosing elective classes for the first year
+	'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
+	'It is possible to enroll in up to 3 elective classes, which have to be chosen now.'
+	if $university['elective_semester_1_1'] = '':
+		act 'Read about Computer class elective':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
+			'You read about the computer class, it seems to be a basic class that teaches you how to use a computer. Some of the more basic common programs, how to trouble shoot the OS if something goes wrong, all and all it seems like a fairly useful class with how much computers are involved in every day life.'
+			act 'Enroll in Computers 101 and 102':
+				cla
+				'You decide to enroll in Computers 101 and 102, for the first and second semester of this year.'
+				$university['elective_semester_1_1'] = 'Computers 101'
+				$university['elective_semester_2_1'] = 'Computers 102'
+				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'
+			end
+			act 'Don''t enroll in Computer elective right now': gt 'intro_uni', 'select_electives'
+		end
+	end
+	if $university['elective_semester_1_2'] = '':
+		act 'Read about Art class elective':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/system/1_openings/6_uni/degree_choice.jpg"></center>'
+			'The class is about learning how to draw, it will start off with the basics and move onto the more advance art studies by the end of the second semester. It might be fun to just take a class for the fun of it.'
+			act 'Enroll in Art 101 and 102':
+				cla
+				'You decide to enroll in Art 101 and 102, for the first and second semester of this year.'
+				$university['elective_semester_1_2'] = 'Art 101'
+				$university['elective_semester_2_2'] = 'Art 102'
+				act 'Consider other elective classes': gt 'intro_uni', 'select_electives'
+			end
+			act 'Don''t enroll in Art elective right now': gt 'intro_uni', 'select_electives'
+		end
+	end
+	act 'Don''t enroll in anymore elective classes': gt 'intro_uni', 'dorm_intro'
+end
+
 if $ARGS[0] = 'dorm_intro':
 	!! Going to the dorm to get the keys
 	*clr & cla

locations/uni_admin.qsrc

@@ -131,10 +131,18 @@ if $ARGS[0] = 'enrollment':
 				'You shake your head and thank her, telling her you will think about it. She smiles at you and tells you she understands before you leave.'
 				act 'Leave class':gt 'uni_admin', 'start'
 			end
-			act 'You don''t have enough money':
-				cla
-				'You tell her you don''t have enough money to pay for the classes. She nods in understanding and tells you to come back and sign up later if you get the money. You thank her for the information and leave.'
-				act 'Leave class':gt 'uni_admin', 'start'
+			if money < 15000 and karta < 15000:
+				act 'You don''t have enough money':
+					cla
+					'You tell her you don''t have enough money to pay for the classes. She nods in understanding and tells you to come back and sign up later if you get the money. You thank her for the information and leave.'
+					act 'Leave class':gt 'uni_admin', 'start'
+				end
+			else
+				act 'You don''t want to sign up':
+					cla
+					'You shake your head and thank her, telling her you will think about it. She smiles at you and tells you she understands before you leave.'
+					act 'Leave class':gt 'uni_admin', 'start'
+				end
 			end
 			gs 'uni_admin', 'prep_pay'
 		end
@@ -215,8 +223,8 @@ if $ARGS[0] = 'select_electives':
 				$university['elective_semester_2_1'] = 'Computers 102'
 				act 'Consider other elective classes': gt 'uni_admin', 'select_electives'
 			end
+			act 'Don''t enroll in Computer elective right now': gt 'uni_admin', 'select_electives'
 		end
-		act 'Don''t enroll in Computer elective right now': gt 'uni_admin', 'select_electives'
 	end
 	if $university['elective_semester_1_2'] = '':
 		act 'Read about Art class elective':
@@ -231,8 +239,8 @@ if $ARGS[0] = 'select_electives':
 				$university['elective_semester_2_2'] = 'Art 102'
 				act 'Consider other elective classes': gt 'uni_admin', 'select_electives'
 			end
+			act 'Don''t enroll in Art elective right now': gt 'uni_admin', 'select_electives'
 		end
-		act 'Don''t enroll in Art elective right now': gt 'uni_admin', 'select_electives'
 	end
 	act 'Don''t enroll in anymore elective classes': gt 'uni_admin', 'start'
 end