Quellcode durchsuchen

[added] Information about university added to the journal such as schedule and grade information. It would probably be good if a proof reader to a look at the file.

bgkjdgbizgblzdgbr vor 2 Jahren
Ursprung
Commit
2b1192b089
3 geänderte Dateien mit 130 neuen und 4 gelöschten Zeilen
  1. 2 0
      locations/cikl.qsrc
  2. 90 0
      locations/journal.qsrc
  3. 38 4
      locations/uni_programs.qsrc

+ 2 - 0
locations/cikl.qsrc

@@ -1625,10 +1625,12 @@ if week = 1:
 	elseif university['semester_week'] > 0 and university['semester_week'] < 15: 
 		university['semester_week'] += 1
 		gs 'grades', 'calculate_grade', 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
+		gs 'grades', 'assing_grade_description', 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
 	elseif university['semester_week'] = 15:
 		university['semester_week'] = 0
 		university['exam_week'] = 1
 		gs 'grades', 'calculate_grade', 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
+		gs 'grades', 'assing_grade_description', 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>'
 	elseif university['exam_week'] = 1: 
 		university['exam_week'] = 2
 	elseif university['exam_week'] = 2: 

+ 90 - 0
locations/journal.qsrc

@@ -161,6 +161,7 @@ if $ARGS[0] = 'records':
 	'<br><center><a href="exec: gt ''journal'', ''locations''">Locations</a></center>'
 	'<br><center><a href="exec: gt ''journal'', ''friends_family''">Friends & Family</a></center>'
 	if SchoolAtestat = 0 and storyline = 1 and SchoolBlock = 0: '<br><center><a href="exec: gt ''journal'', ''school''">School</a></center>'
+	if university['student'] = 1: '<br><center><a href="exec: gt ''journal'', ''uni''">University</a></center>'
 	'<br><center><a href="exec: gt ''journal'', ''clothing''">Clothing information</a></center>'
 	
 	'<center><h2>Relationships</h2></center>'
@@ -1467,6 +1468,95 @@ if $ARGS[0] = 'outcasts':
 	act 'Put your notebook down': gt $loc, $loc_arg
 end
 
+if $ARGS[0] = 'uni':
+	
+	if university['diploma'] > 0:
+		'You have graduated from The University of St. Petersburg with degree in '+func('uni_programs', 'program_name')+'.'
+	else
+		'You have are enrolled in semester <<university[''enrolled_in_semester'']>> of the '+func('uni_programs', 'program_name')+' at The University of St. Petersburg.'
+	end
+
+	if $university['elective1'] ! '' or $university['elective2'] ! '' or $university['elective3'] ! '':
+		*nl
+		'This semester you are taking the following elective classes <<$university[''elective1'']>>, <<$university[''elective2'']>>, <<$university[''elective1'']>>.'
+	end
+
+	i = 1
+	:semester_loop
+	if university['semester_passed'] = i:
+		*nl
+		'You passed semester <<i>> with the following grades:'
+		j = 0
+		:class_loop
+		if $class_list_institution[j] = 'uni_<<$university[''enrolled_in'']>>_semester_<<i>>':
+			'<<$class_list_name[j]>>: <<$class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']>>'
+		end
+		j += 1
+		if ARRSIZE('class_list_institution') >= j: jump 'class_loop'
+		killvar 'j'		
+	end
+	i += 1
+	if i < 8: jump 'semester_loop'
+	killvar 'i'
+	
+	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
+		'You need to enroll in you next semester at the university administration'
+	elseif university['semester_week'] <= 0 and university['exam_week'] = 0:
+		'You currently have a break between the semesters'
+		if university['semester_week'] = -1:
+			'The next semester will start next week'
+		end
+
+		'<center><h2>Class schedule for Next Semester</h2></center>'
+	
+		'Monday: '+func('uni_programs', 'uni_period_first', 'monday')+' '+func('uni_programs', 'uni_period_second', 'monday')+' '+func('uni_programs', 'uni_period_third', 'monday')
+		'Tuesday: '+func('uni_programs', 'uni_period_first', 'tuesday')+' '+func('uni_programs', 'uni_period_second', 'tuesday')+' '+func('uni_programs', 'uni_period_third', 'tuesday')
+		'Wednesday: '+func('uni_programs', 'uni_period_first', 'wednesday')+' '+func('uni_programs', 'uni_period_second', 'wednesday')+' '+func('uni_programs', 'uni_period_third', 'wednesday')
+		'Thursday: '+func('uni_programs', 'uni_period_first', 'thursday')+' '+func('uni_programs', 'uni_period_second', 'thursday')+' '+func('uni_programs', 'uni_period_third', 'thursday')
+
+	elseif university['semester_week'] > 0:
+		'You are in the <<university[''semester_week'']>> week of the semester which last 15 weeks.'
+
+		'<center><h2>Class schedule</h2></center>'
+	
+		'Monday: '+func('uni_programs', 'uni_period_first', 'monday')+' '+func('uni_programs', 'uni_period_second', 'monday')+' '+func('uni_programs', 'uni_period_third', 'monday')
+		'Tuesday: '+func('uni_programs', 'uni_period_first', 'tuesday')+' '+func('uni_programs', 'uni_period_second', 'tuesday')+' '+func('uni_programs', 'uni_period_third', 'tuesday')
+		'Wednesday: '+func('uni_programs', 'uni_period_first', 'wednesday')+' '+func('uni_programs', 'uni_period_second', 'wednesday')+' '+func('uni_programs', 'uni_period_third', 'wednesday')
+		'Thursday: '+func('uni_programs', 'uni_period_first', 'thursday')+' '+func('uni_programs', 'uni_period_second', 'thursday')+' '+func('uni_programs', 'uni_period_third', 'thursday')
+
+		'<center><h2>Grades</h2></center>'
+	
+		gs 'grades', 'assing_grade_description', 'school'
+	
+		j = 0
+		:grade_loop
+		if $class_list_institution[j] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
+			If dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (4*<<university[''semester_week'']>> + 32)'):
+				'You think you are doing great in <<$class_list_name[j]>> and will probably pass with a top grade if you keep this up.'
+			elseIf dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') > dyneval( 'RESULT = (2*<<university[''semester_week'']>> + 32)'):
+				'You you following the <<$class_list_name[j]>> class well and will probably pass with a good grade if you keep this up. But to get the top mark you need to put in some more effort'
+			elseIf dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= dyneval( 'RESULT = (1*<<university[''semester_week'']>> + 32)'):
+				'You you have trouble following the <<$class_list_name[j]>> class but will probably still pass. But if you want a good grade you really need to do somethingthin about it'
+			elseIf dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') < 40:
+				'You will fail your <<$class_list_name[j]>> class unless you do something about it right now. It might even be to late to catch up.'
+			else
+				'You are hopelessly behind in your <<$class_list_name[j]>> class can probably still pass. Any hope of getting a good grade will require that you start doing something about it right now'
+			end
+		end
+		j += 1
+		if ARRSIZE('class_list_institution') >= j: jump 'grade_loop'
+		killvar 'j'		
+	
+	elseif university['exam_week'] = 1:
+		'You are in the first of the two weeks of exams'
+	else
+		'You are in the last of the two weeks of exams'
+	end
+	
+	act 'Go back': gt 'journal', 'records'
+	act 'Put your notebook down': gt $loc, $loc_arg
+end
+
 if $ARGS[0] = 'clothing':
 	'<center>Clothing information</center>'
 	*nl

+ 38 - 4
locations/uni_programs.qsrc

@@ -7,12 +7,26 @@
 !! $university['enrolled_in'] is the name of the university program the player is enrolled in, there is the following progams: teaching_studies
 !! university['enrolled_in_semester'] is the semester the player enrolled in starting fom 1 for the first semester and ending with 8 for the last.
 
-
+if $ARGS[0] = 'program_name':
+	if  $university['enrolled_in']= 'teaching_studies':
+		$RESULT = 'teaching studies'
+	end
+end
 
 if $ARGS[0] = 'uni_period_first':
+	!!This arg have two functions. If calles with gs without any optional argument it will make the cations to go to class availeble.
+	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in'] = 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
-			if week = 1: 
+			if $ARGS[1] = 'monday':
+				$Result = 'General Education (9:00 to 10:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'General Education (9:00 to 10:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'General Education (9:00 to 10:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Teaching Methods (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': 
@@ -58,9 +72,19 @@ if $ARGS[0] = 'uni_period_first':
 end
 
 if $ARGS[0] = 'uni_period_second':
+	!!This arg have two functions. If calles with gs without any optional argument it will make the cations to go to class availeble.
+	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
-			if week = 1: 
+			if $ARGS[1] = 'monday':
+				$Result = 'Teaching Methods (11:00 to 12:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'Lerning Theories (11:00 to 12:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Teaching Methods (11:00 to 12:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Lerning Theories (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': 
@@ -102,9 +126,19 @@ if $ARGS[0] = 'uni_period_second':
 end
 
 if $ARGS[0] = 'uni_period_third':
+	!!This arg have two functions. If calles with gs without any optional argument it will make the cations to go to class availeble.
+	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
-			if week = 1 and $university['elective1'] ! '': 
+			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 = 'Lerning Theories (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':