5 次代码提交 9422459af3 ... f405a91814

作者 SHA1 备注 提交日期
  Dank f405a91814 [fixed] Corrected counting and array access issues with the deletion GoSub function in music_onlinemusic. After deleting old songs, the game was not properly counting the number of uploadable songs. 1 年之前
  Dank c1b6fa1151 [fixed] Typo in array varriable name ml_onlinesong_freshness 1 年之前
  bgkjdgbizgblzdgbr b71f2e5d26 [fixed] Lazar don't have two dicks, so he can double penetrate Katja on his own. 1 年之前
  bgkjdgbizgblzdgbr a75474f614 [added] New elective psychology class by nutluck. 1 年之前
  Kevin_Smarts a2096af6b7 [fixed] Felix fix from Felix to remove the gap above table, thanks to Felix 1 年之前

+ 1 - 1
locations/cikl.qsrc

@@ -1167,7 +1167,7 @@ if ml_onlinesongcount > 0:
 !!      this so every song counts only every 7 days and only for a limited number of weeks 
 		if ml_onlinesong_freshness[i] > 0:		
 			j += 1
-			ml_tempsong_freshness[j] = ml_onlinesong_sfreshness[i]
+			ml_tempsong_freshness[j] = ml_onlinesong_freshness[i]
 			ml_tempsong_lastcalcday[j] = ml_onlinesong_lastcalcday[i]
 			ml_tempsong_hotcat[j] = ml_onlinesong_hotcat[i]
 			ml_tempsong_skilllevel[j] = ml_onlinesong_skilllevel[i]

+ 16 - 0
locations/intro_uni.qsrc

@@ -151,6 +151,22 @@ if $ARGS[0] = 'select_electives':
 			act 'Don''t enroll in the art class': gt 'intro_uni', 'select_electives'
 		end
 	end
+	if $university['elective_semester_1_3'] = '':
+		act 'Read about the psychology 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 psychology to better understand how and why people think they way they do. It will start off with the basics before moving onto the more advanced behavior studies by the end of the second semester. It might be fun to take part in such a relaxed class.'
+			act 'Enroll in the psychology class':
+				cla
+				'You decide to enroll in the psychology class for the first and second semester of this year.'
+				$university['elective_semester_1_3'] = 'Psychology 101'
+				$university['elective_semester_2_3'] = 'Psychology 102'
+				act 'Consider other elective classes': gt 'uni_admin', 'select_electives'
+			end
+			act 'Don''t enroll in the psychology class': gt 'uni_admin', 'select_electives'
+		end
+	end
 	act 'Don''t enroll in any more elective classes': gt 'intro_uni', 'dorm_intro'
 end
 

+ 1 - 1
locations/item_cart.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'shoppping_aisle':
 		else
 			$item_line += '<TD></TD>'
 		end
-		$item_line
+		*p $item_line
 		i += 1
 	if i <= item_idx:jump 'loopshopping_cart'
 	'</table></center>'

+ 2 - 2
locations/katja_uni_sex.qsrc

@@ -1100,8 +1100,8 @@ if $ARGS[0] = 'lazar_ivan_katja_dp':
 		end
 		if npc_vag['A14'] < dick2: npc_vag['A14'] += 1
 		if npc_vag['A14']*2 < dick2: npc_vag['A14'] += 1
-		if npc_ass['A14'] < dick2: npc_ass['A14'] += 1
-		if npc_ass['A14']*2 < dick2: npc_ass['A14'] += 1
+		if npc_ass['A14'] < dick1: npc_ass['A14'] += 1
+		if npc_ass['A14']*2 < dick1: npc_ass['A14'] += 1
 		gs 'arousal', 'foreplay', 1, 'group', 'lesbian'
 		gs 'stat'
 		act 'Watch Katja get both holes plowed at the same time':

+ 4 - 2
locations/music_onlinemusic.qsrc

@@ -236,9 +236,9 @@ if $ARGS[0] = 'deleting':
 	j = -1
 	
 	:deletemusic
-		if (ml_onlinesong_uploaded = 1) or (ml_onlinesong_uploaded = 0 and ml_onlinesong_skilllevel > ml_threshold_skilllevel):
+		if (ml_onlinesong_uploaded[i] = 1) or (ml_onlinesong_uploaded[i] = 0 and ml_onlinesong_skilllevel[i] > ml_threshold_skilllevel):
 			j += 1
-			ml_tempsong_freshness[j] = ml_onlinesong_sfreshness[i]
+			ml_tempsong_freshness[j] = ml_onlinesong_freshness[i]
 			ml_tempsong_lastcalcday[j] = ml_onlinesong_lastcalcday[i]
 			ml_tempsong_hotcat[j] = ml_onlinesong_hotcat[i]
 			ml_tempsong_skilllevel[j] = ml_onlinesong_skilllevel[i]
@@ -258,6 +258,7 @@ if $ARGS[0] = 'deleting':
 	killvar 'i'
 
 	ml_onlinesongcount = 0
+	ml_uploadablemusic = 0
 
 	if j >= 0:
 		:looprebuildsongs
@@ -266,6 +267,7 @@ if $ARGS[0] = 'deleting':
 			ml_onlinesong_lastcalcday[ml_onlinesongcount] = ml_tempsong_lastcalcday[ml_onlinesongcount]
 			ml_onlinesong_skilllevel[ml_onlinesongcount] = ml_tempsong_skilllevel[ml_onlinesongcount]
 			ml_onlinesong_uploaded[ml_onlinesongcount] = ml_tempsong_uploaded[ml_onlinesongcount]
+			if (ml_onlinesong_uploaded[ml_onlinesongcount] = 0): ml_uploadablemusic += 1
 			ml_onlinesongcount += 1
 		if ml_onlinesongcount <= j: jump 'looprebuildsongs'
 	end

+ 22 - 2
locations/uni_admin.qsrc

@@ -196,8 +196,12 @@ if $ARGS[0] = 'enrollment_semester':
 					*nl
 					'She tells you that you''ve enrolled at the last minute, and that classes have already started.'
 				end
-				act 'Leave without taking any electives': gt 'uni_admin', 'start'
- 			end
+				if university['enrolled_in_semester'] mod 2 = 1:
+					act 'Leave without taking any electives': gt 'uni_admin', 'start'
+				else
+					act 'Leave': gt 'uni_admin', 'start'				
+				end
+			end
 		end
 	end
 end
@@ -238,6 +242,22 @@ if $ARGS[0] = 'select_electives':
 			act 'Don''t enroll in the art class': gt 'uni_admin', 'select_electives'
 		end
 	end
+	if $university['elective_semester_1_3'] = '':
+		act 'Read about the psychology 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 psychology to better understand how and why people think they way they do. It will start off with the basics before moving onto the more advanced behavior studies by the end of the second semester. It might be fun to take part in such a relaxed class.'
+			act 'Enroll in the psychology class':
+				cla
+				'You decide to enroll in the psychology class for the first and second semester of this year.'
+				$university['elective_semester_1_3'] = 'Psychology 101'
+				$university['elective_semester_2_3'] = 'Psychology 102'
+				act 'Consider other elective classes': gt 'uni_admin', 'select_electives'
+			end
+			act 'Don''t enroll in the psychology class': gt 'uni_admin', 'select_electives'
+		end
+	end
 	act 'Don''t enroll in any more elective classes': gt 'uni_admin', 'start'
 end
 

+ 191 - 52
locations/uni_lessons_electives1.qsrc

@@ -1,11 +1,13 @@
 # uni_lessons_electives1
 close all
-!! elective classes in this file computers_101, art_101
+!! elective classes in this file computers_101, art_101, psychology_101
 !!Evgeny Yurievich Blagov - Computer 101, 30''s, decent looking fit
 !!Leonid Ilyushin - Art 101, short unattractive middle aged man
-!!uni students taking computer electives. - Anushka Konstantinov, Dimka Nosov, Djibril Maina, Natasha Belova
-!!uni students taking art electives. - Feofan Krupin, Igor Kruglov, Natasha Belova
+!!Dmitriy Gennadievich Kucherov - Psychology 101, young decent looking
+!!uni students taking computer elective. - Anushka Konstantinov, Dimka Nosov, Djibril Maina, Natasha Belova
+!!uni students taking art elective. - Feofan Krupin, Igor Kruglov, Natasha Belova
 !!art models - Anushka Konstantinov, Albina Barlovskaya (TBA)
+!!uni students taking psychology elective. - Kendra Abiodun, Katja Meynold, Vicky Meynold
 
 !!make computers_101 a Monday class and art_101 a Tuesday class. I will try and do a 3rd elective next update to finish out enough electives for the first year so the player can have a full schedule, then I will work on adding more later. Goal is to have 12 elective classes, 3 for each year and the player can choose which classes in which year.
 if $ARGS[0] = 'Computers 101':
@@ -13,8 +15,8 @@ if $ARGS[0] = 'Computers 101':
 	!!gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'Computers 101'
 	gs 'exp_gain', 'intel', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/computer/class.jpg"></center>'
-	'You walk into the classroom and take a seat at one of the computer lab stations. The rest of your classmates walk in one by one before Mr. Blagov enters the classroom and closes the door. He turns to the class and starts today''s lecture.'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/computer/class.jpg"></center>'
+	'You walk into the classroom and take a seat at one of the computer stations. The rest of your classmates walk in one-by-one before Mr. Blagov enters the lab and closes the door. He turns to the class and begins today''s lecture.'
 	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
@@ -26,13 +28,13 @@ if $ARGS[0] = 'Computers 101':
 			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
-			'You listen attentively to Mr. Blagov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
+			'You listen attentively to Mr. Blagov for the duration of the class. He manages to make today''s lesson interesting and informative, and you feel like you''ve 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', 'computers 101', pcs_chrsm
 				gs 'exp_gain', 'intel', rand(1,2)
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
-				'Mr. Blagov nods approvingly, happy to see his students engaged 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 lesson now.'
+				'Mr. Blagov nods approvingly, happy to see his students engaged and trying their best. He happily spends some extra time explaining the topic again, and answers any additional questions you might have. You feel smarter, thoroughly understanding today''s lesson.'
 				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'computers_101'
 			end
 			act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'computers_101'
@@ -146,8 +148,8 @@ if $ARGS[0] = 'Art 101':
 	gs 'exp_gain', 'agil', rand(0,1)
 	gs 'exp_gain', 'artskls', rand(0,1)
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-	'You walk into the classroom and see Mr. Ilyushin standing by his desk as the rest of your classmates walk in one by one under his watchful eye. You notice his eyes linger a bit longer on some of the prettier girls that are dressed in revealing clothes. Once everyone is seated, he starts talking about art and what it means while being his usual friendly and overly chatty self. He seems very passionate about art and not only loves to draw and paint, but discuss what art means and it''s history in the world.'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+	'You walk into the classroom and see Mr. Ilyushin standing by his desk as the rest of your classmates walk in one-by-one under his watchful eye. You notice his eyes linger a bit longer on some of the prettier girls that are dressed in revealing clothes. Once everyone is seated, he starts talking about art and what it means while being his usual friendly and overly chatty self. He seems very passionate about art and not only loves to draw and paint, but discuss what art means and it''s history in the world.'
 	act 'Pay attention in class':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
@@ -235,34 +237,34 @@ if $ARGS[0] = 'art_101_model':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'Today is a lesson about the history of art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
 			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
 			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. The class goes by fairly quickly.'
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester, too. The class goes by fairly quickly.'
 		elseif temprand <= 7:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model."'
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model."'
 			'Mr. Ilyushin walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and sits on the raised platform. "Today, we have one of your fellow students as a model."'
-			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. The class goes by fairly quickly.'
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on the raised platform. "Today, we have one of your fellow students as a model."'
+			'Mr. Ilyushin walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester, too. The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	end
@@ -276,35 +278,35 @@ if $ARGS[0] = 'art_101_model_igor':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'Today is a lesson about the history of art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly and Igor seems really engrossed by it.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly and Igor seems engrossed by it.'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most. The class goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most. The class goes by fairly quickly.'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do fairly decent and ends up asking more questions than most.' 
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Igor seems to do well and ends up asking more questions than most.' 
 			'The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
 			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before walking to the back of the class and telling everyone to start.' 
-			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Igor seems intent on his drawing and is doing a very good job of capturing how her clothes fit her feminine form.' 
+			'He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester, too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
 			'The class goes by fairly quickly.'
 		elseif temprand <= 7:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model."' 
-			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing a very good job of capturing how her clothes fit her feminine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'He walks to the back of the classroom and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how her clothes fit her feminine form.' 
 			'The class goes by fairly quickly.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and sits on the raised platform. "Today, we have one of your fellow students as a model."' 
-			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Igor seems intent on his drawing and is doing a very good job of capturing how his clothes fit his masculine form.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on the raised platform. "Today, we have one of your fellow students as a model."' 
+			'He then walks to the back of the class and tells everyone to start, then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester, too. Meanwhile, Igor seems intent on his drawing and is doing an excellent job capturing how his clothes fit his masculine form.' 
 			'The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -318,34 +320,34 @@ if $ARGS[0] = 'art_101_model_feofan':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'Today is a lesson about the history and art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. Feofan seems semi bored with the class and keeps doodling instead of listening, but the lecture goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. Feofan seems semi bored with the class and keeps doodling instead of listening, but the lecture goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object. Feofan mutters something about how he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object. Feofan mutters something about he didn''t take art class to draw a bowl of fruit as Mr. Ilyushin walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
 			'The class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Holy shit..." you hear Feofan mutter before he seems to blush and look away, worried someone might have overheard him. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right.' 
+			'Anushka straddles the wooden bar and you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom. "Alright class, begin." He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester, too. Meanwhile, Feofan seems to spend a lot of time trying to draw her breasts just right.' 
 			'The class goes by fairly quickly.'
 		elseif temprand <= 7:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Sweet..." you hear Feofan mutter as the girl comes in.'
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Sweet..." you hear Feofan mutter as the girl comes in.'
 			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. Meanwhile Feofan seems to spend a lot of time trying to draw her breasts just right.'
 			'The class goes by fairly quickly.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform against one of the walls as a young good looking man comes in and sits down on the raised platform. "Aww, man!" you hear Feofan mutter in disappointment.' 
-			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too. Meanwhile, Feofan seems to be focusing on trying to draw the guys shoes.' 
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform against one of the walls as a young, good-looking man comes in and sits on the raised platform. "Aww, man!" you hear Feofan mutter in disappointment.' 
+			'"Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester, too. Meanwhile, Feofan seems to be focusing on trying to draw the guys shoes.' 
 			'The class goes by fairly quickly.'
 		end
 		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
@@ -359,36 +361,36 @@ if $ARGS[0] = 'art_101_model_natasha':
 	if university['semester_week'] < 8:
 		temprand = rand(1,5)
 		if temprand = 1:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'Today is a lesson about the history and art and the effects it has had on society throughout the ages. Mr. Ilyushin focuses on one time period where art made a real difference, as he puts it, in the world. The lecture goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'Today''s lesson concerns the history of art and its impact on society throughout the ages. Mr. Ilyushin focuses on one time period when ''art made a real difference in the world,'' as he puts it. The lecture goes by fairly quickly.'
 			'You notice that Natasha appears to like this lecture as she appears very comfortable with theory.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		else
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. The class goes by fairly quickly.'
 			'You notice that Natasha really concentrates on the subject and seems to be very comfortable with the lesson.'
 			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 		end
 	else
 		temprand = rand(1,10)
 		if temprand <= 3:
-			'<center><img <<$set_imgh>> src="images/locations/island/university/classroom/electives/art/class.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin brings out a fairly mundane everyday object and places it on the raised platform. He slides the platform to the center of the room so it''s easy for everyone to see, then asks everyone to draw the object from their vantage point. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/art/class.jpg"></center>'
+			'After the lecture, Mr. Ilushin slides a raised platform to the center of the room. Retrieving an everyday object from a cupboard, he places it on the platform and ensures everyone can see it. He makes a few observations about shadow and light before telling the class to begin drawing the object. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'You notice that Natasha seems happy drawing the object and gets on with it, rarely needing guidance from the professor, but the class goes by fairly quickly.'
 		elseif temprand <= 5:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/anushka1.jpg"></center>'
 			'After he finishes his lecture, Mr. Ilyushin brings out a wooden bar as a familiar face walks into the classroom. It''s Anushka. "Today, we have one of your fellow students as a model. Please take your seat, Miss Konstantinov."' 
-			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester too.'
+			'Anushka straddles the wooden bar, you can tell by his reaction that wasn''t what he had in mind, but he quickly smiles as if he approves before he walks to the back of the classroom and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed. While you''re drawing Anushka, you overhear a few of your male classmates talking about how they hope she models next semester, too.'
 			'You look over at Natasha and notice that as soon as Anushka straddles the bar, she gets deeply embarrassed and starts blushing. She clearly struggles during the lesson, requiring the professor to spend some time with her, but the class goes by fairly quickly.'
 		elseif temprand <= 7:
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/female1.jpg"></center>'
-			'After he finishes his lecture, Mr. Ilyushin slides the platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
+			'After he finishes his lecture, Mr. Ilyushin slides a raised platform to the center of the room so it''s easy for everyone to see as a young woman comes in and lays down on the raised platform. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.'
 			'You notice that Natasha seems to struggle at first and blushes slightly. After a few pointers from the professor, she gains confidence and seems happy to continue.'
 			'The class goes by fairly quickly.'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/model/male1.jpg"></center>'
-			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young good looking man comes in and sits down on the raised platform. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
-			'While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester too.'
+			'After he finishes his lecture, he slides the platform against one of the walls. A moment later a young, good-looking man comes in and sits on the raised platform. "Today, we have one of your fellow students as a model," Mr. Ilyushin says as he walks to the back of the class and tells everyone to start. He then walks around the class checking on each student, stopping to give pointers or answer questions as needed.' 
+			'While you''re drawing him, you overhear a few of your female classmates talking about how they hope he models next semester, too.'
 			'You''re sitting next to Natasha and notice that as soon as the model takes his place, she gets very embarrassed and starts blushing. She clearly struggles to concentrate and keeps making mistakes as you see her rubbing out parts of her drawing and starting over until the professor comes over and talks to her.'
 			'The class goes by fairly quickly.'
 		end
@@ -396,5 +398,142 @@ if $ARGS[0] = 'art_101_model_natasha':
 	end
 end
 
+if $ARGS[0] = 'Psychology 101':
+	menu_off = 1
+	!!gs 'grades', 'attend_class', 'uni_teaching_studies_semester_1', 'Psychology 101'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/computer/class.jpg"></center>'
+	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
+			gs 'exp_gain', 'compskl', rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
+			'You listen attentively to Mr. Kucherov for the duration of the class. He manages to make today''s lesson interesting and informative, and you feel like you''ve 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', 'psychology 101', pcs_chrsm
+				gs 'exp_gain', 'intel', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Kucherov nods approvingly, happy to see his students engaged and trying their best. He happily spends some extra time explaining the topic again, and answers any additional questions you might have. You feel smarter, thoroughly understanding today''s lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		end
+	else
+		act 'Listen attentively to Mr. Kucherov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Don''t pay attention in class':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+		'Mr. Kucherov''s lecture is fairly interesting but just not about something you find all that engaging; you are having a hard time focusing on the class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+	end
+	act 'Talk to a classmate':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		'As you arrive in class, you look around and decide to sit next to...'
+		if meet_kendra = 1:
+			act 'Kendra':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A82', 'like'
+				gs 'exp_gain', 'chrsm', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
+				if kendraQW['sub'] < 1:
+					'You start to sit next to Kendra, when she looks over at you. "I don''t think so, Princess. We are not friends and I want nothing to do with you. Go sit somewhere else."'
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+				elseif kendraQW['sub'] >= 10:
+					if npc_rel['A82'] >= 60:
+						'You sit next to Kendra. You talk to her and she even lets you get in a few words edgewise, but she mostly treats you like a pet or someone simple - making condescending comments often.'
+					elseif npc_rel['A82'] <= 20:
+						'You start to sit next to Kendra, when she looks over at you. "We are not friends. You are nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, ever. So, go sit somewhere else."'
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					else
+						'You sit next to Kendra. You try and have a conversation with her, but mostly she talks and you listen. Anytime you try and get a word in edgewise, she just gives you a dirty look until you shut up and let her keep talking.'
+					end
+				else
+					if npc_rel['A82'] >= 60:
+						'You sit next to Kendra. You talk to her and she even lets you get in a few words edgewise, but she mostly treats you like a pet or someone simple - making condescending comments often.'
+					elseif npc_rel['A82'] <= 20:
+						'You start to sit next to Kendra, when she looks over at you. "I don''t think so, Princess. We are not friends. You are nothing more than my toy to be used when and where I want, and now is not the time. Go sit somewhere else."'
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					else
+						'You sit next to Kendra. You try and have a conversation with her, but mostly she talks and you listen. Any time you try and get a word in edgewise she just gives you a dirty look until you shut up and let her keep talking.'
+					end
+				end
+				gs 'stat'
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+		else
+			act 'Ebony girl':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A82', 'like'
+				gs 'exp_gain', 'chrsm', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
+				if hotcat >= 5:
+					meet_kendra = 1
+					'There is something about this ebony girl that intrigues you, so you sit down next to her. "Hi, I''m <<$pcs_nickname>>."'
+					'She eyes you like a pair of shoes she might buy. After slow consideration, she says in her exotic accent, "I''m Kendra, but you can call me Mistress. If you like, I can train you to become one of my slaves."'
+					'You are taken aback by her comment. "Slaves?"'
+					'She smiles. "Yes, I have many sex slaves here, and I can train you to serve me well. If you are interested, come to my dorm room. It''s on the eighth floor of the east dorm, room 808."'
+					'For the rest of class, she ignores you. You wonder if you should visit her dorm room and see what the Hell she was talking about.'
+				else
+					'There is something about this ebony girl that intrigues you, so you sit down next to her. "Hi, I''m <<$pcs_nickname>>."'
+					'She eyes you like a pair of shoes she might buy. After slow consideration, she says in her exotic accent, "No. Not interested." Before turning away, she adds, "Maybe if you do something about all ... ''this'', you can ask try again," her hand indicating your entire person with languid disinterest.'
+					'You are taken aback by her comment. "What?"'
+					'She rolls her eyes, believing your shocked silence to be stupidity. "Just go away."'
+					'For the rest of class, she ignores you. You wonder if she doesn''t find you attractive enough to get her attention; maybe if you wer better looking she would talk to you.'
+				end
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+		end
+		!!act 'Katja':
+		!!	*clr & cla
+		!!	gs 'npc_relationship', 'modify', 'A14', 'like'
+		!!	gs 'exp_gain', 'chrsm', rand(1,2)
+		!!	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		!!	if npc_rel['A14'] >= 60:
+		!!		if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
+		!!			'optional text if the npc judges Sveta on high slut fame, feel free to change the numbers'
+		!!		else
+		!!			'text for them being good friends. feel free to change the rel requirement up or down, 60 is the default.'
+		!!		end
+		!!	elseif npc_rel['A14'] <= 20:
+		!!		'text for Sveta trying to talk to the npc hates her'
+		!!	else
+		!!		'text if they just know each other and have no strong feelings one way or the other'
+		!!	end
+		!!	gs 'stat'
+		!!	act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		!!end
+		!!act 'Vicky':
+		!!	*clr & cla
+		!!	gs 'npc_relationship', 'modify', 'A15', 'like'
+		!!	gs 'exp_gain', 'chrsm', rand(1,2)
+		!!	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		!!	if npc_rel['A15'] >= 60:
+		!!		if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
+		!!			'optional text if the npc judges Sveta on high slut fame, feel free to change the numbers'
+		!!		else
+		!!			'text for them being good friends. feel free to change the rel requirement up or down, 60 is the default.'
+		!!		end
+		!!	elseif npc_rel['A15'] <= 20:
+		!!		'text for Sveta trying to talk to the npc hates her'
+		!!	else
+		!!		'text if they just know each other and have no strong feelings one way or the other'
+		!!	end
+		!!	gs 'stat'
+		!!	act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		!!end
+	end
+end
+
 --- uni_lessons_electives1 ---------------------------------
 

+ 137 - 0
locations/uni_lessons_electives2.qsrc

@@ -423,5 +423,142 @@ if $ARGS[0] = 'art_102_model_natasha':
 	end
 end
 
+if $ARGS[0] = 'Psychology 102':
+	menu_off = 1
+	!!gs 'grades', 'attend_class', 'uni_teaching_studies_semester_2', 'Psychology 102'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/electives/computer/class.jpg"></center>'
+	'You walk into the classroom and take a seat at one of the tables. The rest of your classmates walk in one-by-one before Mr. Kucherov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kucherov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			!!gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'psychology 101', pcs_intel
+			gs 'exp_gain', 'compskl', rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
+			'You listen attentively to Mr. Kucherov for the duration of the class. He manages to make today''s lesson interesting and informative, and you feel like you''ve 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', 'psychology 101', pcs_chrsm
+				gs 'exp_gain', 'intel', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Kucherov nods approvingly, happy to see his students engaged and trying their best. He happily spends some extra time explaining the topic again, and answers any additional questions you might have. You feel smarter, thoroughly understanding today''s lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		end
+	else
+		act 'Listen attentively to Mr. Kucherov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Don''t pay attention in class':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+		'Mr. Kucherov''s lecture is fairly interesting but just not about something you find all that engaging; you are having a hard time focusing on the class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+	end
+	act 'Talk to a classmate':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		'As you arrive in class, you look around and decide to sit next to...'
+		if meet_kendra = 1:
+			act 'Kendra':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A82', 'like'
+				gs 'exp_gain', 'chrsm', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
+				if kendraQW['sub'] < 1:
+					'You start to sit next to Kendra, when she looks over at you. "I don''t think so, Princess. We are not friends and I want nothing to do with you. Go sit somewhere else."'
+					'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+				elseif kendraQW['sub'] >= 10:
+					if npc_rel['A82'] >= 60:
+						'You sit next to Kendra. You talk to her and she even lets you get in a few words edgewise, but she mostly treats you like a pet or someone simple - making condescending comments often.'
+					elseif npc_rel['A82'] <= 20:
+						'You start to sit next to Kendra, when she looks over at you. "We are not friends. You are nothing more than my white slave bitch to use and abuse as I see fit. You don''t come over to me in public, ever. So, go sit somewhere else."'
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					else
+						'You sit next to Kendra. You try and have a conversation with her, but mostly she talks and you listen. Anytime you try and get a word in edgewise, she just gives you a dirty look until you shut up and let her keep talking.'
+					end
+				else
+					if npc_rel['A82'] >= 60:
+						'You sit next to Kendra. You talk to her and she even lets you get in a few words edgewise, but she mostly treats you like a pet or someone simple - making condescending comments often.'
+					elseif npc_rel['A82'] <= 20:
+						'You start to sit next to Kendra, when she looks over at you. "I don''t think so, Princess. We are not friends. You are nothing more than my toy to be used when and where I want, and now is not the time. Go sit somewhere else."'
+						'You glance around and notice a few other students staring at you, so you move away from her and find a seat by yourself.' 
+					else
+						'You sit next to Kendra. You try and have a conversation with her, but mostly she talks and you listen. Any time you try and get a word in edgewise she just gives you a dirty look until you shut up and let her keep talking.'
+					end
+				end
+				gs 'stat'
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+		else
+			act 'Ebony girl':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A82', 'like'
+				gs 'exp_gain', 'chrsm', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/ebony_girl_talk.jpg"></center>'
+				if hotcat >= 5:
+					meet_kendra = 1
+					'There is something about this ebony girl that intrigues you, so you sit down next to her. "Hi, I''m <<$pcs_nickname>>."'
+					'She eyes you like a pair of shoes she might buy. After slow consideration, she says in her exotic accent, "I''m Kendra, but you can call me Mistress. If you like, I can train you to become one of my slaves."'
+					'You are taken aback by her comment. "Slaves?"'
+					'She smiles. "Yes, I have many sex slaves here, and I can train you to serve me well. If you are interested, come to my dorm room. It''s on the eighth floor of the east dorm, room 808."'
+					'For the rest of class, she ignores you. You wonder if you should visit her dorm room and see what the Hell she was talking about.'
+				else
+					'There is something about this ebony girl that intrigues you, so you sit down next to her. "Hi, I''m <<$pcs_nickname>>."'
+					'She eyes you like a pair of shoes she might buy. After slow consideration, she says in her exotic accent, "No. Not interested." Before turning away, she adds, "Maybe if you do something about all ... ''this'', you can ask try again," her hand indicating your entire person with languid disinterest.'
+					'You are taken aback by her comment. "What?"'
+					'She rolls her eyes, believing your shocked silence to be stupidity. "Just go away."'
+					'For the rest of class, she ignores you. You wonder if she doesn''t find you attractive enough to get her attention; maybe if you wer better looking she would talk to you.'
+				end
+				act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+			end
+		end
+		!!act 'Katja':
+		!!	*clr & cla
+		!!	gs 'npc_relationship', 'modify', 'A14', 'like'
+		!!	gs 'exp_gain', 'chrsm', rand(1,2)
+		!!	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		!!	if npc_rel['A14'] >= 60:
+		!!		if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
+		!!			'optional text if the npc judges Sveta on high slut fame, feel free to change the numbers'
+		!!		else
+		!!			'text for them being good friends. feel free to change the rel requirement up or down, 60 is the default.'
+		!!		end
+		!!	elseif npc_rel['A14'] <= 20:
+		!!		'text for Sveta trying to talk to the npc hates her'
+		!!	else
+		!!		'text if they just know each other and have no strong feelings one way or the other'
+		!!	end
+		!!	gs 'stat'
+		!!	act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		!!end
+		!!act 'Vicky':
+		!!	*clr & cla
+		!!	gs 'npc_relationship', 'modify', 'A15', 'like'
+		!!	gs 'exp_gain', 'chrsm', rand(1,2)
+		!!	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+		!!	if npc_rel['A15'] >= 60:
+		!!		if fame['city_slut'] >= 300 or fame['pav_slut'] >= 300:
+		!!			'optional text if the npc judges Sveta on high slut fame, feel free to change the numbers'
+		!!		else
+		!!			'text for them being good friends. feel free to change the rel requirement up or down, 60 is the default.'
+		!!		end
+		!!	elseif npc_rel['A15'] <= 20:
+		!!		'text for Sveta trying to talk to the npc hates her'
+		!!	else
+		!!		'text if they just know each other and have no strong feelings one way or the other'
+		!!	end
+		!!	gs 'stat'
+		!!	act 'Wait for the end of the lesson': gs 'uni_lessons_electivesev1', 'psychology_101'
+		!!end
+	end
+end
+
 --- uni_lessons_electives2 ---------------------------------
 

+ 0 - 1
locations/uni_lessons_electivesev1.qsrc

@@ -690,7 +690,6 @@ if $ARGS[0] = 'obey_kendra':
 	end
 end
 
-
 if $ARGS[0] = 'obey_kendra_laydown':
 	*clr & cla
 	dick = 20