Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

hornguy6 11 months ago
parent
commit
0a1ce4977c

+ 2 - 2
locations/din_van.qsrc

@@ -938,7 +938,7 @@ $toymanage = {
 
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
-	elseif analplug = 1 and analplugin = 0 and klismaday = daystart:
+	elseif analplug = 1 and analplugin = 0:
 		act 'Insert your butt plug (0:05)':
 			menu_off = 1
 			cla
@@ -1741,7 +1741,7 @@ if $ARGS[0] = 'shave_options':
 	else
 		'Full Bush'
 	end
-	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],13)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],14)>>"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',5,pcs_pubecol[2],11)>>"></a></center></TD><TD><center><a href="exec:view''<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>''"><img Height = <<shave_img_hgt>> src="<<FUNC(''$pube_image'',16,pcs_pubecol[2],12)>>"></a></center></TD>'
 	*nl
 	'<TR><TD><center>'
 	if pubestyle ! 11 and pcs_pubes > 10:

+ 4 - 6
locations/intro_city_select.qsrc

@@ -98,13 +98,11 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	!! default friendship is 30 for all  npcs not covered by the other options below.
-	gs 'npc_relationship', 'defaultnotschool'
-	!! default friendship is 30 for all for all former classmates
-	gs 'npc_relationship', 'defaultfriendship'
-	!! Sets family and friends relationship values and overwrites the npcstatic data for them
-	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
 	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
 	npc_rel['A18'] = 1
 
 	!!Default Names

+ 6 - 10
locations/intro_sg_select.qsrc

@@ -51,7 +51,12 @@ if $ARGS[0] = 'start':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	gs 'npc_relationship', 'defaultnotschool'
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
+	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
 
 	if $start_type[1] ! 'tg':
 		!!Default Names
@@ -179,15 +184,6 @@ if $ARGS[0] = 'SGStart3':
 	*nl
 	'In the Pavlovsk start, you awaken at your parent''s home in the provincial town of Pavlovsk <i>(Recommended for new players)</i>. In the Gadukino start, you are visiting your grandparent''s house in the small farming village of Gadukino.'
 
-
-	!! default friendship is 30 for all students
-	gs 'npc_relationship', 'defaultfriendship'
-
-	!! Sets family and friends relationship values and overwrites the npcstatic data for them
-	!! Vasily Shulgin starts at 60, Mitka at 40, Kolyamba and Vasyan at 20
-	gs 'npc_relationship', 'default_family_friends'
-	npc_rel['A18'] = 1
-
 	act 'Pavlovsk Start':
 		gt 'intro_sg_select', 'pav_start'
 	end

+ 5 - 6
locations/intro_sg_tg.qsrc

@@ -184,13 +184,12 @@ if $ARGS[0] = 'settings':
 	gs 'npcstatic5'
 	gs 'npcstatic6'
 
-	gs 'npc_relationship', 'defaultnotschool'
-
-	!! Set all schoolkids to 30 rel except for outcasts
-	gs 'npc_relationship', 'defaultfriendship'
-
-	!! Set defaults for family and friends
+	!! default friendship is 30 for all  npcs
+	gs 'npc_relationship', 'default'
+	!! changes the values for family members and old friends
 	gs 'npc_relationship', 'default_family_friends'
+	!! Makes sure Christina hates the player character
+	npc_rel['A18'] = 1
 
 	!! Sveta was an outcast (good girl start)
 	gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0

+ 40 - 2
locations/intro_uni.qsrc

@@ -111,11 +111,49 @@ 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''s possible to enroll in up to 3 elective classes, which have to be chosen now.'
+	if $university['elective_semester_1_1'] = '':
+		act 'Read about the computer class':
+			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 read about the computer class, which seems to be a basic class that teaches you how to use a computer, the functions of some of the more basic programs and how to troubleshoot the OS if something goes wrong. It seems like a fairly useful class.'
+			act 'Enroll in the computer class':
+				cla
+				'You decide to enrol in the computer class 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 'uni_admin', 'select_electives'
+			end
+			act 'Don''t enroll in the computer class': gt 'uni_admin', 'select_electives'
+		end
+	end
+	if $university['elective_semester_1_2'] = '':
+		act 'Read about the art class':
+			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>'
+			'This class is about learning how to draw. It will start off with the basics before moving onto the more advanced art studies by the end of the second semester. It might be fun to take part in such a relaxed class.'
+			act 'Enroll in the art class':
+				cla
+				'You decide to enroll in the art class 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 'uni_admin', 'select_electives'
+			end
+			act 'Don''t enroll in the art class': gt 'uni_admin', 'select_electives'
+		end
+	end
+	act 'Don''t enroll in any more elective classes': gt 'uni_admin', 'start'
+end
+
 if $ARGS[0] = 'dorm_intro':
 	!! Going to the dorm to get the keys
 	*clr & cla

+ 8 - 0
locations/npc_relationship.qsrc

@@ -241,4 +241,12 @@ if $ARGS[0] = 'defaultnotschool':
 	if r <= aarraynumber :jump 'default_friendship_loop2'
 end
 
+if $ARGS[0] = 'default':
+	r = 1
+	:default_friendship_loop3
+		gs 'npc_relationship', 'set', 'A<<r>>', 30
+		r += 1
+	if r <= aarraynumber :jump 'default_friendship_loop2'
+end
+
 --- npc_relationship ---------------------------------

+ 58 - 54
locations/uni_admin.qsrc

@@ -23,27 +23,27 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">The University Administration Building</font></b></center>'
+	'<center><b><font color="maroon">University Administration Building</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/uni_admin.jpg"></center>'
-	'The main lobby is large with several pillars spread across the room. At each end of the room is a large set of stairs that go up to the next level. Several hallways going off in all directions stand opposite you.'
+	'The main lobby is large with several pillars spread across the room. At each end of the room is a large set of stairs that go up to the next level, with several hallways branching off in all directions standing opposite you.'
     if university['diploma'] > 0:
 		'You have graduated from the university.'
 	elseif university['expelled_for_missing_exam'] = 0 and university['expelled'] = 1:
-		'You have been expelled from the university for failing your exams.'
+		'You''ve been expelled from the university for failing your exams.'
 	elseif university['expelled_for_missing_exam'] = 1:
-		'You have been expelled from the university for skipping your exams.'
+		'You''ve been expelled from the university for skipping your exams.'
 	elseif func('uniutil', 'student', 'expelled_for_other_reason'):
-		'You have been expelled from the university for reasons unrelated to your exam results.'
+		'You''ve been expelled from the university for reasons unrelated to your exam results.'
 	elseif university['student'] = 0:
 		if university['enrolled_in_semester'] = 0:
-			'Enrollment period for new students is form May to August, All new students will start their classes in the week that includes September 1st' 
+			'The enrollment period for new students is from May to August. All new students will start their classes in the week that includes September 1st.' 
 		end
 		if university['prep_enrolled'] = 1 and month = 8:
 			'You''ve enrolled in the preparatory classes.'
 		elseif university['prep_enrolled'] = 1:
-			'You''ve enrolled in the preparatory classes. They will start in August'
+			'You''ve enrolled in the preparatory classes. They will start in August.'
 		else
-			'You can take preparatory classes at the university on weekdays for 15000<b>₽</b>.'
+			'You can take preparatory classes at the university on weekdays for 15,000<b>₽</b>.'
 		end
 		'Admission exams for the university are held in August.'
 	end
@@ -76,22 +76,22 @@ if $ARGS[0] = 'enrollment':
 	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 people around your age waiting in a side room. You inform them that you wish to enroll at the university. They take down your name and ask you to wait in the waiting room until your name is called. You walk into the other room and nod at the other prospective students before taking a seat.'
+	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of people around your age waiting in a side room. You inform them that you wish to enroll at the university and they take your name down before asking you to take a seat in the waiting room until your name is called. You walk into the other room and nod at the other prospective students before taking a seat.'
 	act 'Wait your turn':
 		cla & *clr
-		'<center><b><font color="maroon">Enrollment office</font></b></center>'
+		'<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, who leads you down a side hall to one of the offices. You take a seat and introduce yourself, and after a brief discussion the woman takes your information and enters it into the computer.'
 		if class['school_grade_average'] >= 70 or university['entrance_exam_passed'] = 1:
 			minut += 15
-			'She looks over your information, including that the classes for all new students will start in the week that includes September 1st, and fills in some data. Several minutes later, she turns to you and smiles, telling you that you are eligible to enroll at the university. She gives you a lot of paperwork and you spend some time filling it all out. Once done, she asks you to stand up so she can take your picture. As she works on your university ID card she tells you about the different degrees, giving you time to decide which one you want to choose.'
+			'She looks over your information and fills in some data. Several minutes later, she turns to you and smiles, telling you that you''re eligible to enroll at the university. She gives you a lot of paperwork and you spend some time filling it all out. Once done, she asks you to stand up so she can take your picture before telling you about the different degrees as she works on your ID card, giving you time to decide which one you want to choose.'
 			act 'Teaching degree':
 				cla
-				'You inform her you wish to acquire a teaching degree. She hands you a packet of information about the classes you will be attending and about dorm life. She then inquires if you will be signing up for any elective classes at this time.'
+				'You inform her you wish to acquire a teaching degree and she hands you a packet of information about the classes you will be attending and about dorm life. She then inquires if you will be signing up for any elective classes at this time.'
 				act 'Not right now':
 					cla
 					'You shake your head and tell her you don''t intend to sign up for any elective classes right now. She nods and makes a few more notes before handing over your finished paperwork, welcoming you to Saint Petersburg University. You get up and leave, looking forward to when you can come back and start your classes.'
-					act 'Leave':gt 'uni_admin', 'start'
+					act 'Leave': gt 'uni_admin', 'start'
 				end
 				act 'Enroll':
 					!!This sets the variables such that the player is enrolled in the first semester of the teaching program.
@@ -111,30 +111,34 @@ if $ARGS[0] = 'enrollment':
 					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 your 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. Finally she reminds you that including that the classes for all new students will start in the week that includes September 1st'
+					'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. She hands over your ID, along with all of your paperwork, stating that you''re officially enrolled as a student at Saint Petersburg University and reminding you that classes will start in the week that includes September 1st.'
 					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.'
+						'She tells you that you''ve enrolled at the last minute, and that classes have already started.'
 					end
-					'She informs you that the University offers several elective classes, that will broaden your education.'
+					'She informs you that the university offers several elective classes that can broaden your education.'
 					act 'Select elective classes': gt 'uni_admin', 'select_electives'
-					act 'Leave':gt 'uni_admin', 'start'
+					act 'Leave': gt 'uni_admin', 'start'
 				end
 			end
 		else
 			university['entrance_information'] = 1
 			minut += 5
-			'She looks over the information, filling in some data. Several minutes later she turns to you and frowns, telling you that you''re not eligible to enroll at the university at this time. Your grades from secondary school were not good enough. She informs you that with so many students applying, they can only take those with better grades, but you can still get in if you take the preparatory classes and pass them with a high enough grade. You do have to pay for them though.'
-			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
-			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'
+			'She looks over the information and fills in some data. Several minutes later, she turns to you and frowns, telling you that you''re not eligible to enroll at the university since your grades from secondary school weren''t good enough. She informs you that with so many students applying, they can only take those with better grades, but you can still get in if you take the preparatory classes and pass them with a high enough grade.'
+			'The classes cost 15,000 <b>₽</b>.'
+			if money < 15000 and karta < 15000:
+				act 'You don''t have enough money':
+					cla
+					'You tell her you can''t afford to pay for the classes and she nods in understanding, telling you to come back and sign up later if you get the money. You thank her for the information and leave.'
+					act 'Leave': 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
@@ -151,12 +155,12 @@ if $ARGS[0] = 'enrollment_semester':
 	'You enter the enrollment office, where there are several desks with women working behind them and a fair number of people around your age waiting in a side room. You inform them that you wish to register for your next semester.'
 	act 'Wait your turn':
 		cla & *clr
-		'<center><b><font color="maroon">Enrollment office</font></b></center>'
+		'<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, who leads you down a side hall to one of the offices. You take a seat and introduce yourself, and 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 your information and fills in some data. Several minutes later she turns to you and smiles, telling you that you since you passed your last semester you can register 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.'
+			'She looks over your information and fills in some data. Several minutes later she turns to you and smiles, telling you that you since you passed your last semester you can register for 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
@@ -190,56 +194,56 @@ if $ARGS[0] = 'enrollment_semester':
 				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.'
+					'She tells you that you''ve enrolled at the last minute, and that classes have already started.'
 				end
-				act 'Leave with out taking any electives': gt 'uni_admin', 'start'
+				act 'Leave without taking any electives': gt 'uni_admin', 'start'
  			end
 		end
 	end
 end
 
 if $ARGS[0] = 'select_electives':
-	'<center><b><font color="maroon">Enrollment office</font></b></center>'
+	'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.jpg"></center>'
-	'She gives you a paper showing all the current elective classes. Asking if you would be interested in any of them.'
+	'She gives you a list of all the current elective classes and asks if you would be interested in any of them.'
 	if $university['elective_semester_1_1'] = '':
-		act 'Read about Computer class elective':
+		act 'Read about the computer class':
 			cla & *clr
-			'<center><b><font color="maroon">Enrollment office</font></b></center>'
+			'<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 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':
+			'You read about the computer class, which seems to be a basic class that teaches you how to use a computer, the functions of some of the more basic programs and how to troubleshoot the OS if something goes wrong. It seems like a fairly useful class.'
+			act 'Enroll in the computer class':
 				cla
-				'You decide to enroll in Computers 101 and 102, for the first and second semester of this year.'
+				'You decide to enrol in the computer class 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 'uni_admin', 'select_electives'
 			end
+			act 'Don''t enroll in the computer class': 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':
+		act 'Read about the art class':
 			cla & *clr
-			'<center><b><font color="maroon">Enrollment office</font></b></center>'
+			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/enrollment2.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':
+			'This class is about learning how to draw. It will start off with the basics before moving onto the more advanced art studies by the end of the second semester. It might be fun to take part in such a relaxed class.'
+			act 'Enroll in the art class':
 				cla
-				'You decide to enroll in Art 101 and 102, for the first and second semester of this year.'
+				'You decide to enroll in the art class 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 'uni_admin', 'select_electives'
 			end
+			act 'Don''t enroll in the art class': 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'
+	act 'Don''t enroll in any more elective classes': gt 'uni_admin', 'start'
 end
 
 if $ARGS[0] = 'prep_pay':
 	if money >= 15000:
-		act 'Pay for the preparatory classes (15000<b>₽</b>) (Cash)':
+		act 'Pay for the preparatory classes (15,000<b>₽</b>) (Cash)':
 			cla & *clr
 			minut += 10
 			money -= 15000
@@ -247,12 +251,12 @@ if $ARGS[0] = 'prep_pay':
 			university['prep_enrolled'] = 1
 			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/payment.jpg"></center>'
-			'You go back to the enrollment office and pay 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
+			'You pay 15,000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
 			act 'Leave':gt 'uni_admin', 'start'
 		end
 	end
 	if karta >= 15000:
-		act 'Pay for the preparatory classes (15000<b>₽</b>) (Card)':
+		act 'Pay for the preparatory classes (15,000<b>₽</b>) (Card)':
 			cla & *clr
 			minut += 10
 			karta -= 15000
@@ -260,7 +264,7 @@ if $ARGS[0] = 'prep_pay':
 			university['prep_enrolled'] = 1
 			'<center><b><font color="maroon">Enrollment Office</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/payment.jpg"></center>'
-			'You go back to the enrollment office and pay 15000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
+			'You pay 15,000<b>₽</b> for the preparatory classes. They are held every weekday until <b>21:00</b>.'
 			act 'Leave':gt 'uni_admin', 'start'
 		end
 	end
@@ -276,7 +280,7 @@ if $ARGS[0] = 'take_prep':
 	'<center><b><font color="maroon">Preparatory Class</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/admin/prepcourse1.jpg"></center>'
 	'You attend the preparatory class for an hour. You pay close attention to what is being said and take notes for the entrance examination later on.'
-	act 'Leave class':gt 'uni_admin', 'start'
+	act 'Leave class': gt 'uni_admin', 'start'
 end
 
 if $ARGS[0] = 'take_test':
@@ -290,15 +294,15 @@ if $ARGS[0] = 'take_test':
 	'You enter the exam room and take your seat. A professor comes out and talks about the different parts of the exam you will be taking and what is required to pass. Once he''s finished, he passes out the papers and starts the clock. You have one hour to complete the test.'
     if pcs_intel +university['prep_counter'] >= 100:
 		university['entrance_exam_passed'] = 1
-		'You completed the entrance examination and passed it with a perfect score.'
+		'You completed the entrance examination and passed with a perfect score.'
 	elseif pcs_intel + university['prep_counter'] >= 80:
 		university['entrance_exam_passed'] = 1
-		'You completed the entrance examination and passed it.'
+		'You completed the entrance examination and passed.'
 	else
 		university['entrance_exam_passed'] = -1
 		'You completed the entrance exam, but failed to pass.'
 	end
-	act 'Leave the exam room':gt 'uni_admin', 'start'
+	act 'Leave the exam room': gt 'uni_admin', 'start'
 end
 
 --- uni_admin ---------------------------------

+ 32 - 16
locations/wardrobe.qsrc

@@ -53,7 +53,6 @@ if $ARGS[0] = 'main':
 	PShoHeels = ShoHeels
 	PShoCut = ShoCut
 	PShoStyle = ShoStyle
-	default_sport_number[1] = 0
 	menu_off = 1
 	gs 'stat'
 	if CloBra = 1: gs 'bras', 'remove'
@@ -886,15 +885,27 @@ if $ARGS[0] = 'default_sport_options':
 	if default_sport_number = 0:
 		'We have no default sports clothing set, you can set this in your wardrobe.'
 	else
-		if default_sport_number[1] = 0:
+		!! checks to see if player is wearing the default sports set using default_sport_number[2]
+		default_sport_number[2] = 0
+		if $clothingworntype = $defclothingtype[default_sport_number] and clothingwornnumber = defclothingnumber[default_sport_number]: default_sport_number[2] += 1
+		if defunderwear[default_sport_number] = 2:
+			if $bodysuitworntype = $defbodysuittype[default_sport_number] and bodysuitwornnumber = defbodysuitnumber[default_sport_number]: default_sport_number[2] += 1
+		else
+			if $pantyworntype = $defpantytype[default_sport_number] and pantywornnumber = defpantynumber[default_sport_number] and $braworntype = $defbratype[default_sport_number] and brawornnumber = defbranumber[default_sport_number]: default_sport_number[2] += 1
+		end
+		if $shoeworntype = $defshoegtype[default_sport_number] and shoewornnumber = defshoenumber[default_sport_number]: default_sport_number[2] += 1
+		if $currentpursetype = $defpursetype[default_sport_number] and currentpursenumber = defpursenumber[default_sport_number]: default_sport_number[2] += 1
+		if $coatworntype = $defcoattype[default_sport_number] and coatwornnumber = defcoatnumber[default_sport_number]: default_sport_number[2] += 1
+
+		!! check to see that player is not wearing default sports outfit
+		if default_sport_number[2] ! 5:
 			act'Put on your sports clothes':
-				default_sport_number[1] = 1
 				$lastwornclothingtype['sport'] = $clothingworntype
 				lastwornclothingnumber['sport'] = clothingwornnumber
 				lastwornunderwear['sport'] = underwear['type']
 				if defunderwear[default_sport_number] = 2:
-					$defbodysuittype['sport'] = $bodysuitworntype
-					defbodysuitnumber['sport'] = bodysuitwornnumber
+					$lastwornbodysuittype['sport'] = $bodysuitworntype
+					lastwornbodysuitnumber['sport'] = bodysuitwornnumber
 				else
 					$lastwornpantytype['sport'] = $pantyworntype
 					lastwornpantynumber['sport'] = pantywornnumber
@@ -912,19 +923,24 @@ if $ARGS[0] = 'default_sport_options':
 			end
 		else
 			act'Put your regular clothes back on':
-				default_sport_number[1] = 0
-				gs 'clothing', 'wear', $lastwornclothingtype['sport'], lastwornclothingnumber['sport']
-
-				if lastwornunderwear['sport'] = 2:
-					gs 'underwear_bodysuits', 'wear', $defbodysuittype['sport'], defbodysuitnumber['sport']
+				if $lastwornclothingtype['sport'] = '':
+					gs 'clothing', 'wear_last_worn'
+					gs 'underwear', 'wear'
+					gs 'shoes', 'wear', 'last_worn'
 				else
-					gs 'panties', 'wear', $lastwornpantytype['sport'], lastwornpantynumber['sport']
-					gs 'bras', 'wear', $lastwornbratype['sport'], lastwornbranumber['sport']
+					gs 'clothing', 'wear', $lastwornclothingtype['sport'], lastwornclothingnumber['sport']
+
+					if lastwornunderwear['sport'] = 2:
+						gs 'underwear_bodysuits', 'wear', $lastwornbodysuittype['sport'], lastwornbodysuitnumber['sport']
+					else
+						gs 'panties', 'wear', $lastwornpantytype['sport'], lastwornpantynumber['sport']
+						gs 'bras', 'wear', $lastwornbratype['sport'], lastwornbranumber['sport']
+					end
+					gs 'shoes', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
+					gs 'purses', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
+					gs 'coats', 'wear', $lastworncoattype['sport'], lastworndefcoatnumber['sport']
+					gt $loc, $loc_arg
 				end
-				gs 'shoes', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
-				gs 'purses', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
-				gs 'coats', 'wear', $lastworncoattype['sport'], lastworndefcoatnumber['sport']
-				gt $loc, $loc_arg
 			end
 		end
 	end