Explorar el Código

Merge remote-tracking branch 'upstream/master' into home-and-internet

Netuttki hace 1 año
padre
commit
4bbab6356d

+ 5 - 0
glife.qproj

@@ -942,9 +942,14 @@
 		<Location name="uni_lessons"/>
 		<Location name="uni_lessons1"/>
 		<Location name="uni_lessons2"/>
+		<Location name="uni_lessons3"/>
+		<Location name="uni_lessons4"/>
 		<Location name="uni_lessonsev1"/>
+		<Location name="uni_lessonsev2"/>
 		<Location name="uni_exams1"/>
 		<Location name="uni_exams2"/>
+		<Location name="uni_exams3"/>
+		<Location name="uni_exams4"/>
 		<Location name="uni_library"/>
 		<Location name="uni_events"/>
 		<Location name="uniutil"/>

+ 7 - 7
locations/ApperanceSystem.qsrc

@@ -43,7 +43,7 @@ if $args[0] = 'UpdateBaseAppearnce':
 	! Calculte base appearance
 	pcs_apprncbase = skinBonus + bodyShapeBonus + attributeBonus - visibleAgePenalty - teethPenalty + supnatvnesh
 
-end 
+end
 
 if $ARGS[0] = 'CalcFaceBonus':
 	!!	Setting Eyelashes bonus
@@ -60,7 +60,7 @@ if $ARGS[0] = 'CalcFaceBonus':
 	elseif pcs_lashes = 5:
 		eyelashesBonus = 6
 	else
-		eyelashesBonus = 0		
+		eyelashesBonus = 0
 	end
 	eyelashesBonus = FUNC($this, 'AdjustFromBMI', eyelashesBonus)
 
@@ -102,7 +102,7 @@ if $ARGS[0] = 'CalcAttributeBonus':
 end
 
 if $ARGS[0] = 'CalcVisibleAgePenalty':
-	if vidag < 20:
+	if vidage < 20:
 		tempAttributePenelty =  5*(20 - vidage)
 	else
 		tempAttributePenelty = 0
@@ -233,7 +233,7 @@ end
 if $ARGS[0] = 'CalcAccessoriesBonus':
 	coatQualityBonus = ARGS[1] & !! bonusZ
 	shoesQualityBonus = ARGS[2] & !! PShoQuality
-	
+
 	!!bonuses for certain underwear
 	if $pantyworntype = 'boutique':
 		pantyBonus = 4
@@ -321,7 +321,7 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 	elseif pcs_leghair <= 6:
 		legPenalty = 6
 	else
-		legPenalty = 9 
+		legPenalty = 9
 	end
 
 	result = sweatPenalty + glassesPenalty + hairDyePenalty + buzzCutPenalty + legPenalty + lipBalmPenalty + hairPenalty + deodorantPenalty
@@ -334,12 +334,12 @@ if $ARGS[0] = 'CalcAppearance':
 
 	temp_apprnc = pcs_apprncbase + clothingBonus + accessoriesBonus + groomingBonus - groomingPenalty
 
-	if temp_apprnc >= 200: temp_apprnc = 200 
+	if temp_apprnc >= 200: temp_apprnc = 200
 	if temp_apprnc < 0: temp_apprnc = 0
 
 	!Any super natural bonuses are allowed to go above the max scale
 	result = temp_apprnc + superNaturalBonus
-	
+
 end
 
 if $ARGS[0] = 'ConvertToHotcat':

+ 62 - 31
locations/KatjaHomeTalk.qsrc

@@ -5,8 +5,8 @@
 !! katjaQW['QWstage'] = 1 You have agreed to hang out with Katja afer school. (meynoldQW = 1)
 !! katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2) 
 !! katjaQW['QWstage'] = 3 You have kissed Katja and she might be interested in more. (katjaFirstKiss = 1 and KatjaOTN)
-!! npc_sex['A14'] = 1 You have had at least one sexual experince with Katja.
-!! katjaQW['QWstage'] = 4 Katja have asked you to helpe have sex with a boy.
+!! npc_sex['A14'] = 1 You have had at least one sexual experience with Katja.
+!! katjaQW['QWstage'] = 4 Katja has asked you to help her have sex with a boy.
 !! katjaQW['QWstage'] = 5 You have agreed to help Katja have sex with a boy.
 !! katjaQW['QWstage'] = 6 You have talked with Katja about her first experience with a boy.
 !! katjaQW['QWstage'] = 7 You have told Katja about the boys in the park.
@@ -64,19 +64,19 @@
 !! katjaQW['knows_BJ'] = 1 You have told Katja that you have given a guy a blow-job (KatjaKnowBJ =1)
 !! katjaQW['knows_sex'] = 1 You have told Katja that you have had virginal sex with a guy (KatjaKnowSex =1)
 !! katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
-!! katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
-!! katjaQW['know_Pirced_tongue'] = 1 katja have noticed your tongue piercing (KatjaKnowPirsA =1)
+!! katjaQW['knows_cuni'] = 1 You have told Katja that you have gone down on another girl (KatjaKnowKuni =1)
+!! katjaQW['know_Pirced_tongue'] = 1 Katja has noticed your tongue piercing (KatjaKnowPirsA =1)
 
-!! katja['school_sex'] = 1 Katja have taken you to a storage room at school to have sex. (katschoolsex)
-!! katjaQW['disco_Foto'] =1 somebody have takien a picture of Katja''s exposed breast at the disco. Right now to only use of this variable is so that another foto wont be taken. (katja_disco_Foto)
+!! katja['school_sex'] = 1 Katja has taken you to a storage room at school to have sex. (katschoolsex)
+!! katjaQW['disco_Foto'] =1 Somebody has taken a picture of Katja''s exposed breast at the disco. Right now the only use of this variable is so that another foto wont be taken. (katja_disco_Foto)
 
 !! katjaQW['drunk_help'] is set to 1 when Katja walks you home from the disco because you are to drunk. Will be reset to 0 after you talk to her about it at school. (meynoldQW = 3)
-!! katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not vearing panties. Will be reset to 0 at night. (katja_disco_end)
-!! KatjaQW['sex_in_the_park_comment'] temposry varibale which is set during sex with guys in the park to make sure she give the right comment before she says goodbuy. Will be rest to 0 when going home after sex. (KatjaOhrenet)
+!! katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not wearing panties. Will be reset to 0 at night. (katja_disco_end)
+!! KatjaQW['sex_in_the_park_comment'] temporary variable which is set during sex with guys in the park to make sure she give the right comment before she says goodbye. Will be rest to 0 when going home after sex. (KatjaOhrenet)
 
 !! katjaQW['know_katja_uni'] = 1 Katja has told you she is going to uni to study teaching.
 !! katjaQW['know_going_to_teaching_degree'] =1 you have told Katja that you are going to the university to study in the teaching program.
-!! katjaQW['meet_uni_class'] = 1 You have meet Katja in you uni class.
+!! katjaQW['meet_uni_class'] = 1 You have met Katja in your uni class.
 
 if $ARGS[0] = '':
 	$loc = 'mey_home'
@@ -155,7 +155,7 @@ if $ARGS[0] = '':
 						gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
 				
 					else
-						if min(katjaQW['horny'],100) > rand(40,160):
+						if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and min(katjaQW['horny'],100) > rand(40,160)):
 							if katjaQW['QWstage'] >= 6 and week < 6 and (locat['Vicky'] = 10 or locat['Vicky'] = 11) and rand(0,6) =0 and katjaQW['Marcus_day'] ! daystart:
 								!!Katja will only have Marcus come over when Vicky is in the park with Vanya and Tamara is not home. She will also only ask for a threesoem 1 out of 7 time she ask you for sex.
 								katjaQW['Marcus_day'] = daystart
@@ -1598,7 +1598,7 @@ if $ARGS[0] = 'TamVal':
 			'"Hu?!"'
 			'That is the most your brain seems capable of answering to Katja''s question and obviously she didn''t take it too well.'
 			'"Sorry <<$pcs_nickname>>! I wasn''t insinuating... I mean... I didn''t want to... ehm..."'
-			'You stare at her. She stares at you. The silence only seems to make the two of you more embarrassed by the second... fuck!'
+			'You stare at her while she stares at you. The silence only seems to make the two of you more embarrassed by the second... fuck!'
 			pcs_mood -= 10
 			npc_rel['A14'] -= 5
 			minut += 5
@@ -1756,9 +1756,15 @@ if $ARGS[0] = 'boy_discussion':
 		act 'Kiss her back': gt 'katjaEvDin', 'kiss'
 	else
 		katjaQW['horny'] += 10
-		'"Do you have any boy in mind?" you ask. "I don''t know. Lazar is hot, but I have the feeling that he would just consider us a check on his list, and not be able to keep his mouth shut." she answers before pondering. "Maybe Marcus? He''s very good looking, and I haven''t heard of him spreading rumors. Most of the others don''t listen to what he says anyway because he''s black and from America. Our classmates are so stupid sometimes." she continues'
-		'"Marcus is hot, but how would we approach him?" you ask. "Try to dance with him at the disco, and get close to him. He really seems to like the girls there, and since you''re the hottest there, I''m sure he''ll like it. Especially if you lead him on like you know how to do," she says in her most flattering voice.'
-		'You smile. "Okay, I''ll try to dance with him at the disco."'
+		'"Do you have any boy in mind?" you ask.' 
+		'"I don''t know. Lazar is hot, but I have the feeling that he would just consider us a check on his list, and not be able to keep his mouth shut," she answers before pondering. "Maybe Marcus? He''s very good looking, and I haven''t heard of him spreading rumors. Most of the others don''t listen to what he says anyway because he''s black and from America. Do you think he will be a good first time?" she asks.' 
+		'"I don''t know, I''ve never had sex with him," you answer. "Maybe you could try that..."' 
+		'Katja looks at you pleading with her big eyes. "Please <<$pcs_nickname>>. I really want my first time to be good, so could you please test him for me?"'
+		*nl
+		'"Marcus is hot, but how would we approach him?" you ask.' 
+		'"Try to dance with him at the disco, and get close to him. He really seems to like the girls there, and since you''re the hottest there, I''m sure he''ll like it. Especially if you lead him on like you know how to do," she says in her most flattering voice.'
+		'You smile. "Okay, I''ll try to dance with him at the disco, and see if I can test him for you."'
+		'"You are the bestest friend!" she says with a huge smile and give you a tight hug.'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 		if mey_vika['key'] = 1:
 			act 'Leave the room': gt 'mey_home', 'start'
@@ -1782,9 +1788,11 @@ if $ARGS[0] = 'anal_discussion':
 		act 'Kiss her back': gt 'katjaEvDin', 'kiss'
 	else
 		katjaQW['horny'] += 10
-		'"Do you have any boy in mind?" you ask. "Well, Ivan seems to be quite interested in our kissing at school. The other girls say that he''s really into anal sex. He''s also very hot." she answers.'
-		'"Yeah, Ivan is hot. I need to find a way to approach him about it though," you reply. "He trains in the gym at the community center in the late afternoon. You might have luck talking with him there. I''ve also heard a rumor that he sometimes uses the women''s shower there," she tells you.'
-		'You smile. "Okay, I''ll try to see if he is up for something there."'
+		'"Do you have any boy in mind?" you ask.' 
+		'"Well, Ivan seems to be quite interested in our kissing at school. The other girls say that he''s really into anal sex. He''s also very hot," she answers. "So maybe you could try him out to see if it doesn''t hurt to much with him? I don''t want my first time to be too painful."'
+		'"Yeah, Ivan is hot. I need to find a way to approach him about it though," you reply.' 
+		'"He trains in the gym at the community center in the late afternoon. You might have luck talking with him there. I''ve also heard a rumor that he sometimes uses the women''s shower there," she tells you.'
+		'You smile. "Okay, I''ll try to see if he''s up for something there and try him out for you."'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 		if mey_vika['key'] = 1:
 			act 'Leave the room': gt 'mey_home', 'start'
@@ -1827,7 +1835,8 @@ if $ARGS[0] = 'random_park_sex_talk':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'Katja gives you the most sultry look she can muster. "You know, sex with Ivan and Marcus is great and all, but I was thinking that it might be time to try other boys."'
-	'"Do you have anybody in mind?" you ask. "Not any of the boys in the class. I don''t think anybody except Ivan could keep their mouth shut about having a threesome with the two hottest chicks in school!" she answers. "I don''t really know anybody else. You''ve been much more around than me, so maybe you know somebody?" she asks.'
+	'"Do you have anybody in mind?" you ask.' 
+	'"Not any of the boys in the class. I don''t think anybody except Ivan could keep their mouth shut about having a threesome with the two hottest chicks in school!" she answers. "I don''t really know anybody else. You''ve been much more around than me, so maybe you know somebody?"'
 	act 'Tell her about the boys in the park':
 		cla
 		katjaQW['horny'] += 5
@@ -1876,7 +1885,8 @@ if $ARGS[0] = 'sex_with_boy_ask':
 		'"So you want me to set it up again?" you ask, and Katja just nods sheepishly. "Okay. Now Ivan doesn''t fuck girls in the pussy since he''s afraid of getting them pregnant, so I assume that you want me to find somebody else?"'
 		'"Yes <<$pcs_nickname>>. You know so many guys, so I''m sure you can arrange my first time to be perfect!" she says in her most persuasive voice.'
 	else
-		'"Okay, so why don''t you?" you ask. "I don''t know how to approach a boy..." she answers "I don''t want a boyfriend, I just want to try having sex with a boy. Can''t you help me arrange it? Please..." she says, looking at you pleadingly with her big eyes.'
+		'"Okay, so why don''t you?" you ask.' 
+		'"I don''t know how to approach a boy..." she answers. "I don''t want a boyfriend, I just want to try having sex with a boy. Can''t you help me arrange it? Please..." she says, looking at you pleadingly with her big eyes.'
 	end
 	act 'Agree': gt 'KatjaHomeTalk', 'boy_discussion'
 	act 'Refuse':
@@ -1914,16 +1924,18 @@ if $ARGS[0] = 'Marcus_answer_talk':
 	katjaQW['Marcus_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'You tell Katja that you''ve talked with Marcus and he agreed. She looks at you exitedly. "So when do we do it?"'
+	'You tell Katja that you''ve talked with Marcus and he agreed. She looks at you excitedly. "So when do we do it?"'
 	'"He agreed to come over when I call him, so we can call him right now, or wait for another time," you answer.'
 	if week < 6 and  (locat['Vicky'] = 10 or locat['Vicky'] = 11) and (katjaQW['horny']+katjaQW['slut']) > 100:
 		'"Okay. Let''s call him right now!" she squeals, her face completely red.'
 		act 'Call Marcus': gt 'katja_sex', 'marcus_wait'
 	elseif (katjaQW['horny'] + katjaQW['slut']) <= 100:
-		'"I don''t know. Maybe another time. I need to think about it some more," she says while looking a little nervous. "Okay, another time then," you reply.'
+		'"I don''t know. Maybe another time. I need to think about it some more," she says while looking a little nervous.' 
+		'"Okay, another time then," you reply.'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 	else
-		'"We can''t call him now! Vicky will be home soon and I don''t want her to see him here!" she says while looking a little panicked. "Okay, we''ll plan it for another day when we have time," you reply.'
+		'"We can''t call him now! Vicky will be home soon and I don''t want her to see him here!" she says while looking a little panicked.' 
+		'"Okay, we''ll plan it for another day when we have time," you reply.'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 	end
 end
@@ -1936,11 +1948,16 @@ if $ARGS[0] = 'first_boy_sex_follow_up':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'Katja gives you a big hug. "Thank you! The experience with Marcus was great!" she says with a huge grin.'
 	if npc_vag['A14'] + 5 < npc_dick['A146']:
-		'"It didn''t hurt too much?" you ask. "It hurt, that was why I couldn''t take it any longer. But it was fun and I think it''ll hurt less the next time," she answers. "So you want to have sex with a boy again?" you reply.'
+		'"It didn''t hurt too much?" you ask.' 
+		'"It hurt, that was why I couldn''t take it any longer. But it was fun and I think it''ll hurt less the next time," she answers.' 
+		'"So you want to have sex with a boy again?" you reply.'
 	else
-		'"It did look like you had fun," you say. "I definitely had fun, I thought it would hurt, but I didn''t feel any pain," she answers. "Might be all the times I used my dildo on you," you reply.'
+		'"It did look like you had fun," you say.' 
+		'"I definitely had fun, I thought it would hurt, but I didn''t feel any pain," she answers.' 
+		'"Might be all the times I used my dildo on you," you reply.'
 	end
-	'"We should definitely do this again some time," she finishes. "We''ll see if the opportunity comes up again," you answer.'
+	'"We should definitely do this again some time," she finishes.' 
+	'"We''ll see if the opportunity comes up again," you answer.'
 	act 'Talk about something else': gt 'KatjaHomeTalk'
 	if katjaQW['birth_control_start_day'] = 0:
 		act 'Tell her that she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
@@ -1995,9 +2012,9 @@ if $ARGS[0] = 'uni_tell':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['know_katja_uni'] = 0:
-		'You tell Katja that you have enroled at the university to study to become a teacher. She replies that she also plans to do the same, and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
+		'You tell Katja that you have enrolled at the university to study to become a teacher. She replies that she also plans to do the same, and that it will be fun studying at the university together. She bombards you with questions about how your enrolment process went.'
 	else
-		'You tell Katja that you have also enroled to study teaching at the university. She replies that it will be fun studying at the university together before you spend the next few minutes talking excitedly about what you know about the program.'
+		'You tell Katja that you have also enrolled to study teaching at the university. She replies that it will be fun studying at the university together before you spend the next few minutes talking excitedly about what you know about the program.'
 	end
 	if $loc = 'mey_home':
 		act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -2040,7 +2057,10 @@ if $ARGS[0] = 'boy_no':
 	katjaQW['boy_block'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'"I don''t have interest in boys" you tell Katja. "Oh" she replies "Does that mean..." she starts but her voice falters. "Yes. I am only interested in girls" you say. Katja doesn''t say anything but her face is getting redder and she looks intensely at you with her big eyes.'
+	'"I don''t have interest in boys," you tell Katja.' 
+	'"Oh," she replies "Does that mean..." she starts, but her voice falters.' 
+	'"Yes. I ''m only interested in girls," you say.' 
+	'Katja doesn''t say anything, but her face is getting redder and she looks intensely at you with her big eyes.'
 	act 'Talk about something else':
 		if $loc = 'Katja_dorm':
 			gt 'katja_dorm', 'talk'
@@ -2064,7 +2084,11 @@ if $ARGS[0] = 'boy_yes':
 	katjaQW['boy_block'] = 0
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'"So I told you earlier that I had no interest in boys" you say "Yes I remember" she say. "Turns out I was wrong. I am in fact starting find boys attractive" you say. "So have you already done something with a boy? Tell me me everything you have done? What is it  you find attractive about boys. Who is the hottest guy in school..." Katja start bombarding you whit questions. "Slow down. This is also something new for me. But we can talk about boys if you want to" you say, as you see Katja''s face getting more red'
+	'"So I told you earlier that I had no interest in boys?" you say.' 
+	'"Yes I remember," she replies.' 
+	'"Turns out I was wrong. I am in fact starting find boys attractive," you say.' 
+	'"So have you already done something with a boy? Tell me everything! What is it you find attractive about boys? Who is the hottest guy in school?" Katja starts bombarding you with questions.' 
+	'"Slow down. This is also something new for me. But we can talk about boys if you want to," you say as you see Katja''s face getting more red.'
 	act 'Talk about something else':
 		if $loc = 'Katja_dorm':
 			gt 'katja_dorm', 'talk'
@@ -2086,9 +2110,16 @@ if $ARGS[0] = 'fisting_ask':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'"Wow" she just says, sitting there thoughtful while her berating is becoming more aroused.  After a little she says "It did not hurt at all?" "Not a lot" you answer, "when you are in control you can make sure that the pain is not to much." She looks thoughtful again. "I don''t think I could do that to myself" she says. "That''s okay. It is not for everybody" you say. "But it does sounds so hot!" she say "Maybe... you could..." her voice trails of. After a moment she continues "Maybe you could show me..." "You want me to fist myself here in front of you?" you ask. "No, I want you... to..." her voice falters again. "You want me fist you?" you ask. She doesn''t say anything but slowly nods. "Right now?" you ask. Again she doesn''t say anything but nods again."'
+	'"Wow," she says, sitting there thoughtful while her breathing is becoming more aroused. After a few seconds, she says "It did not hurt at all?"' 
+	'"Not a lot," you answer. "When you''re in control, you can make sure that the pain is not too much."' 
+	'She looks thoughtful again. "I don''t think I could do that to myself," she says.' 
+	'"That''s okay. It''s not for everybody," you say.' 
+	'"But it does sounds so hot!" she says. "Maybe... you could..." her voice trails off. After a moment, she continues. "Maybe you could show me..."' 
+	'"You want me to fist myself here in front of you?" you ask.' 
+	'"No, I want you... to..." her voice falters again.' 
+	'"You want me fist you?" you ask. She doesn''t say anything, but slowly nods. "Right now?" Again she doesn''t say anything, but nods."'
 	act 'Show Katja how fisting is done': gt 'katja_sex', 'first_fisting'
-	act 'Say you will do another time':
+	act 'Say you will do it another time':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 		'You tell Katja that you are not in the mood right now, but you might do it anther time if she asks.'

+ 15 - 15
locations/albina_chat.qsrc

@@ -554,7 +554,7 @@ if $ARGS[0] = 'cowgirl':
 	act 'I like being in control':
 		cla & *nl
 		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
-		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She''s grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
+		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
 		gs 'albina_chat','cowgirl2'
 	end
 		
@@ -645,28 +645,28 @@ end
 
 if $ARGS[0] = 'anal_questions_shy':
 	if stat['anal'] = 0:
-		act'Where do I start?':
+		act 'Where do I start?':
 			cla & *nl
 			'"Well..." you mumble. "Where do I even start?"'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small.'
+			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
-		act'What position?':
+		act 'What position?':
 			cla & *nl
 			'"What... position should I have my first time in?" you ask shyly.'
-			'"You''re getting way too far ahead of yourself," Albina interrupts. "Here''s my advice: Start small. '
+			'"You''re getting way too far ahead of yourself," Albina interrupts. "Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
-		act'Does it hurt?':
+		act 'Does it hurt?':
 			cla & *nl
 			'"Does it hurt?" you ask shyly.'
-			'"Oh man, if you''re asking that then you''re <i>definitely</i> not ready," Albina laughs. "Here''s my advice: Start small. '
+			'"Oh man, if you''re asking that then you''re <i>definitely</i> not ready," Albina laughs. "Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
-		act'How do you enjoy it?':
+		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you... enjoy it?" you ask, cringing at how badly you phrased it.'
 			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
@@ -677,21 +677,21 @@ end
 
 if $ARGS[0] = 'anal_questions_open':
 	if stat['anal'] = 0:
-		act'Where do I start?':
+		act 'Where do I start?':
 			cla & *nl
 			'"Where do I even start?" you ask.'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small.'
+			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
-		act'What''s the best position?':
+		act 'What''s the best position?':
 			cla & *nl
 			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
-			'"You''re getting way too far ahead of yourself," Albina interrupts, holding her hand up. "Here''s my advice: Start small. '
+			'"You''re getting way too far ahead of yourself," Albina interrupts, holding her hand up. "Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
-		act'How do you enjoy it?':
+		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you enjoy it?" you ask, cringing at the memories of your past experiences.'
 			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
@@ -809,7 +809,7 @@ if $ARGS[0] = 'lover_conversation':
 	end
 	
 	if arrsize('$fuckbuddy') = 1:
-		act'I have a fuckbuddy':
+		act 'I have a fuckbuddy':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Pretty much the same deal as you," you smile. "I keep it casual with a fuckbuddy. We booty call each other whenever we want to get off."'
@@ -818,7 +818,7 @@ if $ARGS[0] = 'lover_conversation':
 			act 'Change the subject': gt 'albina_chat', 'chat'
 		end
 	elseif arrsize('$fuckbuddy') > 1:
-		act'I have a few fuckbuddies':
+		act 'I have a few fuckbuddies':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Pretty much the same deal as you," you smile. "I keep it casual with a few fuckbuddies I have stashed around the way. They booty call me whenever they want to hook up."'

+ 11 - 0
locations/bed2.qsrc

@@ -403,6 +403,17 @@ if $ARGS[0] = 'dream':
 
 	varsleep['time_now'] = daystart*1440 + hour * 60 + minut
 
+	if stime < 300:
+	!!Worsening of skin quality if you do not sleep enough.
+		skinDailyPenalty += 2
+	elseif stime < 360:
+		skinDailyPenalty += 1
+	elseif stime < 420:
+		skinDailyPenalty += 0
+	else
+		skinDailyPenalty -= 1
+	end
+
 	gs 'stat'
 	if slept_in = 1:
 		$waketext = 'You wake up at <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>, after sleeping-in a little longer than planned, but at least you''ve had plenty of sleep.'

+ 2 - 2
locations/beg1.qsrc

@@ -427,7 +427,7 @@ if $ARGS[0] = 'Family extension':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/restoran>"</center>'
 						'You approach the maître d''.'
-						'As expected, he initially refuses your party entry to the restaurant. You briefly explain that you''ve just become the Saint Petersburg track champion for the 100 meter sprint and show him your gold medal as proof, but he remains doubtful. "Okay young lady, can you please tell me your name?"'
+						'As expected, he initially refuses your party entry to the restaurant. You briefly explain that you''ve just become the Saint Petersburg track champion for the 400 meter event and show him your gold medal as proof, but he remains doubtful. "Okay young lady, can you please tell me your name?"'
 						'"<<$pcs_firstname>> <<$pcs_lastname>>," you reply.'
 						'"Okay Miss <<$pcs_lastname>>, one second please." He turns around and approaches a table in the lobby with some national, international and local papers displayed and checks the local paper before returning to you.'
 						minut += 5
@@ -435,7 +435,7 @@ if $ARGS[0] = 'Family extension':
 						act 'Convince him':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/expensiverest/maitredseat>"</center>'
-							'After a brief conversation with him, he disappears for a few minutes before returning and beckoning your mother and Anya to join you. Once they are with you, he smiles. "Normally we wouldn''t allow entry as we have a strict dress code. However, given the circumstances, I''m pleased to tell you that you are all most welcome to eat here as it''s such a special occasion. After all it''s not every day that we have the Saint Petersburg 100 meter sprint champion eating in our fine establishment".'
+							'After a brief conversation with him, he disappears for a few minutes before returning and beckoning your mother and Anya to join you. Once they are with you, he smiles. "Normally we wouldn''t allow entry as we have a strict dress code. However, given the circumstances, I''m pleased to tell you that you are all most welcome to eat here as it''s such a special occasion. After all it''s not every day that we have the Saint Petersburg 400 meter track champion eating in our fine establishment".'
 							'He continues "The manager has also asked me to let you know that you''ll all eat free tonight with a complimentary bottle of champagne. There is one condition though..."'
 							*nl
 							'You look at him a little warily. "Okay, thanks. Umm and the condition?"'

+ 10 - 9
locations/body.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'RegularUpdate':
 		pcs_bmi = func($this, 'CalcBMI')
 	end
 
-	if pcs_skin > 900: pcs_skin = 900
+	if pcs_skin > 1000: pcs_skin = 1000
 	if pcs_skin < 0: pcs_skin = 0
 end
 
@@ -136,15 +136,15 @@ if $ARGS[0] = 'DailyUpdate':
 	
 	if age < 18 and rand (0,2) = 0 and pcs_leghair > 0: pcs_leghair -= 1
 
-	if pcs_skin <= 200:
+	if pcs_skin <= 300:
 		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
-	elseif pcs_skin <= 400:
-		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
 	elseif pcs_skin <= 600:
-		pcs_skin += min(skinDailyGain/2, 5) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
 	elseif pcs_skin <= 800:
-		pcs_skin += min(skinDailyGain/3, 3) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain/2, 5) - skinDailyPenalty - 1
 	elseif pcs_skin <= 900:
+		pcs_skin += min(skinDailyGain/3, 3) - skinDailyPenalty - 1
+	elseif pcs_skin <= 1000:
 		pcs_skin += min(skinDailyGain/5, 2) - skinDailyPenalty - 1
 	end
 
@@ -481,13 +481,14 @@ end
 if $ARGS[0] = 'SkinGain':
 	if $ARGS[1] = 'CleanSelf' and lastShowerSkinGain ! daystart:
 		lastShowerSkinGain = daystart
-		skinDailyGain += 5
-		if bathLuffa = 1: skinDailyGain += 3
+		skinDailyGain += 5 
+		!!needs to be changet to +3 when the bathLuffa in added.
+		!!if bathLuffa = 1: skinDailyGain += 2
 	end
 
 	if $ARGS[1] = 'Moisturizer':
 		moisturizerDailyCount += 1
-		if moisturizerDailyCount <= 2: skinDailyGain += 3
+		if moisturizerDailyCount <= 2: skinDailyGain += 2
 	end
 end
 

+ 43 - 4
locations/booty_call_after.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'ending':
 end
 
 if $ARGS[0] = 'dress':
-	gs 'clothing','wear_last_worn'
+	gs 'clothing', 'wear_last_worn'
 	gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
 	gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 	gs 'stat'
@@ -1425,6 +1425,22 @@ if $ARGS[0] = 'dressing1':
 		
 		gs 'booty_call_after', 'panty_gift'
 	end
+	
+	if hour >= 18 and (week = 5 or week = 6):
+		act'Going to the disco':
+			cla & *nl
+			if booty_call['disco_after'] = 1:
+				'"Weren''t you listening to me?" you say, <<$booty_call[''dress_describe'']>>. "I told you, I''m going to the disco tonight."'
+			else
+				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I want to go to the disco."'
+			end
+			!! add spontaneous disco date
+			gs 'booty_call_after', 'dressing2'
+			
+			gs 'booty_call_after', 'panty_gift'
+		end
+	end
+	
 	if mid($start_type,1,2) = 'sg' and hour >= 20:
 		act'Mom will kill me':
 			booty_call['mom_kill'] = 1
@@ -1470,7 +1486,7 @@ end
 
 if $ARGS[0] = 'dressing2':
 	if booty_call['sleepover'] = 1:
-		gs'booty_call_morning','end_morning'
+		gs'booty_call_morning', 'end_morning'
 	else
 		act'Finish getting dressed':
 			gs'booty_call_after', 'dress_loop'
@@ -1691,12 +1707,35 @@ if $ARGS[0] = 'dress_loop':
 end
 
 if $ARGS[0] = 'after_sex_dressed':
-	act'Head out':
+	act'Prepare to leave':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"I gotta get going."'
 		'"Okay, see you later."'
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Bye':
+			cla & *nl
+			'"Bye," you say with a wave and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+
+		act'See ya':
+			cla & *nl
+			'"See you later," you wink and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+		
+		act'Blow him a kiss':
+			cla & *nl
+			'"Until next time."'
+			'You give him a wink and blow him a kiss and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+		
+		act'Text me':
+			cla & *nl
+			'"Text me later," you say nonchalantly and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
 	end
 	act'Hang out':msg 'Work in progress! To be continued!'
 	act'Break things off':

+ 30 - 15
locations/booty_call_condoms.qsrc

@@ -23,7 +23,7 @@ end
 if $ARGS[0] = 'condoms':
 	if booty_call['condom_setup'] ! 1: gs 'booty_call_condoms', 'setup'
 	gs 'booty_call_condoms', 'check_count'
-	
+	booty_call['must_fuck'] = 1
 	if booty_call['no_condom'] ! 1:
 		if npc_bareback[$boy] = 1 and booty_call['no_condom'] ! 1:
 	!!		if npc_know_bc[$boy] = 1 and npc_condom_conscious[$boy] ! 2: booty_call['no_condom'] = 1
@@ -92,7 +92,7 @@ if $ARGS[0] = 'pc_condoms':
 			'"I think that was my last condom..." you say. "I guess that means we''re both out...?"'
 			'"I guess so," <<$npc_firstname[$boy]>> shrugs.'
 			gs'booty_call_after', 'no_condom_end'
-			gs'booty_call_sex','no_sex_only'
+			gs'booty_call_sex', 'no_sex_only'
 		else
 			'"I think that was my last condom..." you say.'
 			gs'booty_call_after', 'no_condom_end'
@@ -119,11 +119,11 @@ if $ARGS[0] = 'pc_condoms':
 						'"I don''t."'
 					end
 					gs'booty_call_after', 'no_condom_end'
-					gs'booty_call_sex','no_sex_only'
+					gs'booty_call_sex', 'no_sex_only'
 				end
 			end
 		end
-		gs'booty_call_sex','no_sex_only'
+		gs'booty_call_sex', 'no_sex_only'
 	end
 end
 
@@ -188,6 +188,7 @@ if $ARGS[0] = 'npc_condom_use_stats':
 end
 
 if $ARGS[0] = 'npc_condom_use':
+	booty_call['must_fuck'] = 1
 	if booty_call['fuck_count'] > 1 and $booty_call['last_cum'] = 'condom':
 		'<<$npc_firstname[$boy]>> swaps out his used condom for a new one.'
 	elseif booty_call['fuck_count'] > 1:
@@ -308,8 +309,8 @@ if $ARGS[0] = 'npc_promise_wont_creampie':
 				'"Well I don''t," he replies dryly. "I don''t use them."'
 			end
 			gs'booty_call_after', 'no_condom_end'
-			gs'booty_call_sex','no_sex_only'
-			gs'booty_call_condoms','pc_skip_the_condom'
+			gs'booty_call_sex', 'no_sex_only'
+			gs'booty_call_condoms', 'pc_skip_the_condom'
 		else
 			gs 'booty_call_condoms', 'pc_condoms'
 		end
@@ -337,7 +338,7 @@ if $ARGS[0] = 'npc_promise_wont_creampie':
 		gs 'booty_call_sex', 'position_choose'
 	end
 	
-	gs'booty_call_condoms','pc_skip_the_condom'
+	gs'booty_call_condoms', 'pc_skip_the_condom'
 end
 
 if $ARGS[0] = 'condom_why2':
@@ -688,7 +689,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 			end
 			
 			if mesec > 0:
-				act'It''s a safe day':
+				act'I''m on my period':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
 					'"Let''s skip the condom today," you smile. "I don''t think I can get pregnant on my period."'
@@ -705,10 +706,14 @@ if $ARGS[0] = 'temp_disable_condoms':
 				act'It''s probably safe day':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Let''s skip the condom today," you smile. "It''s a safe day for me. I won''t get pregnant."'
-					*nl
-					'<i>Probably...</i> you think guiltily to yourself.'
-					gs 'booty_call_condoms', 'npc_temp_no_condom_react'
+					'"Let''s skip the condom today," you smile. "It should be a safe day for me. I won''t get pregnant."'
+!!					if npc_childfree[$boy] = 1:
+!!						gs 'booty_call_condoms', 'npc_hesitate_childfree'
+!!					else
+						*nl
+						'<i>Probably...</i> you think guiltily to yourself.'
+						gs 'booty_call_condoms', 'npc_temp_no_condom_react'
+!!					end
 				end
 			end
 		end
@@ -717,6 +722,7 @@ end
 
 if $ARGS[0] = 'npc_no_condom_react':
 	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and rand(npc_willpwr[$boy],100) < pcs_persuas):
+		booty_call['condom'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
@@ -731,6 +737,7 @@ end
 
 if $ARGS[0] = 'npc_temp_no_condom_react':
 	if npc_condom_conscious[$boy] = 2 or (npc_condom_conscious[$boy] = 1 and rand(npc_willpwr[$boy],100) < pcs_persuas):
+		booty_call['condom'] = 1
 		'"I want to use one anyways," <<$npc_firstname[$boy]>> says, shaking his head and reaching back for the condom. "Better to be safe."'
 		'Your jaw drops.'
 		*nl
@@ -742,6 +749,12 @@ if $ARGS[0] = 'npc_temp_no_condom_react':
 	gs 'booty_call_sex', 'position_choose'
 end
 
+if $ARGS[0] = 'npc_hesitate_childfree':
+	'<<$npc_firstname[$boy]>> pauses.'
+	'"What do you mean ''should'' be?" he asks.'
+	
+end
+
 if $ARGS[0] = 'pc_dangerous_day':
 	if ovulate > 0 and birth_control['think_safe'] ! 1 and succubusflag ! 1 and booty_call['danger_day'] = 0 and booty_call['safe_day'] = 0:
 		act'Today is a dangerous day':
@@ -808,7 +821,7 @@ if $ARGS[0] = 'pc_dangerous_day':
 							'"Well I don''t," he replies dryly. "I don''t use them."'
 						end
 						gs'booty_call_after', 'no_condom_end'
-						gs'booty_call_sex','no_sex_only'
+						gs'booty_call_sex', 'no_sex_only'
 					else
 						gs 'booty_call_condoms', 'pc_condoms'
 					end
@@ -839,12 +852,12 @@ if $ARGS[0] = 'pc_safe_day':
 	if stat['safe_day'] = 1 or stat['probably_safe_day'] = 1  and birth_control['think_safe'] ! 1 and succubusflag ! 1 and booty_call['danger_day'] = 0 and booty_call['safe_day'] = 0 and booty_call['condom'] = 0:
 		if stat['safe_day'] = 1:
 			$booty_call['safe_day_act'] = 'Today is a safe day'
-			$booty_call['safe_day_desc1'] = 'It''s a safe day for me today'
+			$booty_call['safe_day_desc1'] = 'It''s a safe day'
 			$booty_call['safe_day_creampie_desc'] = 'You can come inside me today'
 			$booty_call['safe_day_no_condom_desc'] = 'We can skip the condom today'
 		elseif stat['probably_safe_day'] = 1:
 			$booty_call['safe_day_act'] = 'I''m probably safe today'
-			$booty_call['safe_day_desc1'] = 'It''s probably a safe day for me today'
+			$booty_call['safe_day_desc1'] = 'It should be a safe day for me'
 			$booty_call['safe_day_creampie_desc'] = 'I think it''ll be okay if you want to come inside me'
 			$booty_call['safe_day_no_condom_desc'] = 'We can skip the condom today'
 		end
@@ -858,6 +871,8 @@ if $ARGS[0] = 'pc_safe_day':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
 				'"<<$booty_call[''safe_day_desc1'']>>," you smile at <<$npc_firstname[$boy]>>. "<<$booty_call[''safe_day_creampie_desc'']>>."'
+!!				if stat['probably_safe_day'] = 1 and npc_childfree[$boy] = 1:
+!!					gs 'booty_call_condoms', 'npc_hesitate_childfree'
 				if $npc_cum_pref[$boy] = 'creampie':
 					'"I''m going to pump you full of so many creampies," he whispers, making you giggle.'
 				else

+ 1 - 1
locations/booty_call_cowgirl.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'cowgirl_start':
 			act'Ride him hard':gt 'booty_call_cowgirl', 'cowgirl3'
 		end
 	elseif booty_call['force_initiative'] = 2:
-		gs'booty_call_sex','speed_select'
+		gs'booty_call_sex', 'speed_select'
 		'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/slow1.mp4"></video></center>'
 		if $booty_call['position'] = 'miss':
 			!! IMAGE HERE

+ 63 - 60
locations/booty_call_cum.qsrc

@@ -257,9 +257,8 @@ if $ARGS[0] = 'fuck_cum':
 						'"Come-! Wherever-! You want-!" you barely manage to get out as <<$npc_firstname[$boy]>>''s cock keeps pounding into you.'
 					end
 				end
-				act'Continue':booty_call['his_choice'] = 2 & gs 'booty_call_cum', 'cum_wherever'
 			end
-			
+			act'Continue':booty_call['his_choice'] = 2 & gs 'booty_call_cum', 'cum_wherever'
 		end
 		
 		act'Finish him with your hand':gt 'booty_call_cum', 'cum_jerkoff'
@@ -321,7 +320,7 @@ if $ARGS[0] = 'fuck_cum':
 		end
 		
 		if $booty_call['position'] = 'cowgirl':
-			act'Make him come inside you':gt'booty_call_cum','cum_force'
+			act'Make him come inside you':gt'booty_call_cum', 'cum_force'
 		end
 
 	elseif $booty_call['cum_choice'] = 'creampie_surprise':
@@ -363,7 +362,7 @@ if $ARGS[0] = 'fuck_cum':
 end
 
 if $ARGS[0] = 'cum_his_choice':
-	if rand(1,5) = 5 or booty_call['his_choice'] = 2:gt'booty_call_cum','cum_his_choice2'
+	if rand(1,5) = 5 or booty_call['his_choice'] = 2:gt'booty_call_cum', 'cum_his_choice2'
 	if booty_call['kiss'] = 1:
 		if $npc_cum_pref[$boy] = 'creampie':
 			gt'booty_call_cum', 'creampie_surprise'
@@ -380,7 +379,7 @@ if $ARGS[0] = 'cum_his_choice':
 			booty_call['pullout'] += 1
 			gt'booty_call_cum', 'cum_pullout'
 		else
-			gt'booty_call_cum','cum_his_choice2'
+			gt'booty_call_cum', 'cum_his_choice2'
 		end
 	else
 		if $npc_cum_pref[$boy] = 'creampie':
@@ -398,7 +397,7 @@ if $ARGS[0] = 'cum_his_choice':
 			booty_call['pullout'] += 1
 			gt'booty_call_cum', 'cum_pullout'
 		else
-			gt'booty_call_cum','cum_his_choice2'
+			gt'booty_call_cum', 'cum_his_choice2'
 		end
 	end
 end
@@ -441,7 +440,8 @@ if $ARGS[0] = 'cum_his_choice2':
 end
 
 if $ARGS[0] = 'cum_wherever':
-	if $booty_call['cum_choice'] = 'creampie' and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+!!	if $booty_call['cum_choice'] = 'creampie' and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+	if $booty_call['cum_choice'] = 'creampie':
 		gt'booty_call_cum', 'creampie_surprise'
 	elseif $booty_call['cum_choice'] = 'mouth':
 		gt'booty_call_cum', 'cum_mouth'
@@ -451,7 +451,8 @@ if $ARGS[0] = 'cum_wherever':
 		booty_call['he_ask_tits'] = 1
 		gs 'booty_call_cum', 'cum_tits1'
 	else
-		if $npc_cum_pref[$boy] = 'creampie' and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+!!		if $npc_cum_pref[$boy] = 'creampie' and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+		if $npc_cum_pref[$boy] = 'creampie':
 			gt'booty_call_cum', 'creampie_surprise'
 		elseif $npc_cum_pref[$boy] = 'mouth':
 			booty_call['mouth_cum'] += 1
@@ -748,7 +749,7 @@ if $ARGS[0] = 'facial_brace':
 			'"You asked me to do it."'
 			if booty_call['he_ask_creampie'] = 1:
 				$booty_call['cum_describe1'] = 'Because,'
-				gs 'booty_call_talk','no_cum_inside'
+				gs 'booty_call_talk', 'no_cum_inside'
 			elseif booty_call['he_ask_mouth'] = 1:
 				act'Swallowing is gross':
 					cla & *clr
@@ -786,7 +787,7 @@ if $ARGS[0] = 'cum_mouth':
 	$booty_call['cum_choice'] = 'mouth'
 	$booty_call['last_cum'] = 'mouth'
 	booty_call['cum_mouth'] += 1
-	gs'cum_call','mouth',$boy,1
+	gs'cum_call', 'mouth',$boy,1
 	!! differing descriptions based on position
 	!!'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
 	'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
@@ -1090,7 +1091,7 @@ if $ARGS[0] = 'creampie_code':
 	if birth_control['think_safe'] = 0 and stat['dangerous_day'] = 1: booty_call['risky_creampie'] = 1
 !!	if birth_control['think_safe'] = 0: booty_call['risky_creampie'] = 1
 	
-	gs'cum_call','',$boy,1
+	gs'cum_call', '',$boy,1
 	$booty_call['cum_choice'] = 'creampie'
 	$booty_call['last_cum'] = 'creampie'
 	if $npc_cum_pref = 'creampie': npc_rel[$boy] += 2
@@ -1114,7 +1115,7 @@ if $ARGS[0] = 'cum_inside':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
-			booty_call['cum_together'] = 2
+			booty_call['came_together'] = 2
 			booty_call['orgasm_count'] += 1
 			'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
 			gs 'booty_call_cum', 'cum_inside_pull_away'
@@ -1124,7 +1125,7 @@ if $ARGS[0] = 'cum_inside':
 			act'Ride it out':
 				cla & *nl
 				'You lay there patiently, letting <<$npc_firstname[$boy]>> empty himself into your womb, waiting until you no longer feel him twitching inside you.'
-				act'Continue':cla & gs'booty_call_sex','sex_end'
+				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'cum_react'
 			end
@@ -1132,7 +1133,7 @@ if $ARGS[0] = 'cum_inside':
 			act'Tolerate it (disgust)':
 				cla & *nl
 				'You lay there, trying not to squirm in discomfort, feeling <<$npc_firstname[$boy]>>''s spunk fill your womb. Despite your disgust, you don''t move, waiting until you no longer feel him twitching inside you.'
-				act'Continue':cla & gs'booty_call_sex','sex_end'
+				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'cum_react'
 			end
@@ -1142,11 +1143,11 @@ if $ARGS[0] = 'cum_inside':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 				gs'stat'
-				booty_call['cum_together'] = 2
+				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
 				booty_call['creampie_orgasm'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
-				act'Continue':cla & gs'booty_call_sex','sex_end'
+				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'creampie_react'
 			end
@@ -1158,7 +1159,7 @@ if $ARGS[0] = 'cum_inside':
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
 			booty_call['orgasm_count'] += 1
-			booty_call['cum_together'] = 2
+			booty_call['came_together'] = 2
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/doggy3.mp4"></video></center>'
 			if booty_call['creampie_ask'] = 1:'"Come inside me!" you cry. "Fill me up!"'
 			'<<$npc_firstname[$boy]>> grunts and you feel him come, cock pulsing inside you. The sensation pushes you over the edge, and you groan, tensing as waves of orgasm wash through you. The two of come together, both of your orgasms fueling the other''s until eventually they both end.'
@@ -1188,7 +1189,7 @@ if $ARGS[0] = 'cum_inside':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 				gs'stat'
-				booty_call['cum_together'] = 2
+				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
 				booty_call['creampie_orgasm'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
@@ -1205,7 +1206,7 @@ if $ARGS[0] = 'cum_inside':
 				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 				gs'stat'
 				booty_call['orgasm_count'] += 1
-				booty_call['cum_together'] = 2
+				booty_call['came_together'] = 2
 				'You drop your hips, impaling yourself on <<$npc_firstname[$boy]>>''s cock. He thrusts his hips upward, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
 			else
 				'You drop your hips, impaling yourself on <<$npc_firstname[$boy]>>''s cock. He grabs you and holds you tight, thrusting humself upward, driving his cock in deep into you as he can manage. As he does, you feel him stiffen up and groan, and his cock pulses inside you.'
@@ -1218,7 +1219,7 @@ if $ARGS[0] = 'cum_inside':
 				gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 				gs'stat'
 				booty_call['orgasm_count'] += 1
-				booty_call['cum_together'] = 2
+				booty_call['came_together'] = 2
 				'<<$npc_firstname[$boy]>> grabs you and pulls you down onto his cock, thrusting his hips upward at the same time, driving himself deep inside you and you feel cum spurt out inside you. The sensation pushes you over the edge, causing your pussy to clamp down onto his cock even more and your body to spasm uncontrollably. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'creampie_react'
@@ -1244,7 +1245,7 @@ if $ARGS[0] = 'cum_inside':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 					gs'stat'
-					booty_call['cum_together'] = 2
+					booty_call['came_together'] = 2
 					booty_call['orgasm_count'] += 1
 					booty_call['creampie_orgasm'] += 1
 					'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
@@ -1299,21 +1300,21 @@ if $ARGS[0] = 'cum_inside_pull_away':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cowgirl3.mp4"></video></center>'
 			'Carefully, you raise yourself off of <<$npc_firstname[$npclastsaved]>>. The moment his cock is free of your pussy, you feel a thick glob of cum begin to leak out of you.'
 		end
-		gs'booty_call_sex','sex_end'
+		gs'booty_call_sex', 'sex_end'
 	end}
 end
 
 if $ARGS[0] = 'cum_together':
-	booty_call['cum_together'] = 1
+	booty_call['came_together'] = 1
 	gs 'booty_call_cum', 'creampie_code'
 	cla & *nl
 	if booty_call['he_ask_creampie'] = 1:
 		if $booty_call['position'] = 'miss':
-			'You just nod, unable to say anything and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you. right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
+			'You just nod, unable to say anything and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
 		elseif $booty_call['position'] = 'doggy':
-			'You just nod, unable to say anything, eagerly throwing your hips back into his thrusts. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you. right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
+			'You just nod, unable to say anything, eagerly throwing your hips back into his thrusts. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
 		elseif $booty_call['position'] = 'cowgirl':
-			'You just nod, unable to say anything and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you. right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
+			'You just nod, unable to say anything and grab hold of him tightly. You can feel <<$npc_firstname[$boy]>>''s cock swelling inside you, right on the edge of bursting. The tension in your pussy feels the same way. It feels like any moment you might just-'
 		end
 	else
 		if $booty_call['position'] = 'miss':
@@ -1386,6 +1387,7 @@ if $ARGS[0] = 'cum_force':
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
+			booty_call['came_together'] = 1
 			booty_call['orgasm_count'] += 1
 			booty_call['creampie_orgasm'] += 1
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
@@ -1408,6 +1410,7 @@ if $ARGS[0] = 'cum_force':
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
 			booty_call['orgasm_count'] += 1
+			booty_call['came_together'] = 1
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cowgirl2.mp4"></video></center>'
 			'With a devilish grin, you suddenly speed up your movements, riding <<$npc_firstname[$boy]>> as hard as you can. Seconds later, you feel him come inside the condom, pulsing within you, and it sends you over the edge. But you don''t stop, not for a second, and you continue to plunge yourself up and down even as you shudder in climax together.'
 			act'Continue':
@@ -1536,7 +1539,7 @@ if $ARGS[0] = 'cum_pullout':
 end
 
 if $ARGS[0] = 'creampie_surprise':
-	if booty_call['condom'] = 1:gt'booty_call_cum','cum_condom'
+	if booty_call['condom'] = 1:gt'booty_call_cum', 'cum_condom'
 	booty_call['creampie_surprise'] = 1
 	gs 'booty_call_cum', 'creampie_code'
 	if $booty_call['position'] = 'miss':
@@ -1574,7 +1577,7 @@ if $ARGS[0] = 'creampie_surprise_react':
 		booty_call['take_in_stride'] = 1
 		cla & *nl
 		'You''re a bit surprised, but you take it in stride, waiting patiently until his cock no longer twitches inside your pussy.'
-		act'Continue':cla & gs'booty_call_sex','sex_end'
+		act'Continue':cla & gs'booty_call_sex', 'sex_end'
 		gs 'booty_call_cum', 'cum_inside_pull_away'
 		gs'booty_call_talk', 'cum_react'
 	end
@@ -1582,9 +1585,9 @@ if $ARGS[0] = 'creampie_surprise_react':
 		act'Creampie induced orgasm':
 			booty_call['orgasm_count'] += 1
 			booty_call['creampie_orgasm'] += 1
-			booty_call['cum_together'] = 2
+			booty_call['came_together'] = 2
 			$orgasm_or = 'yes'
-			gs'arousal','vaginal',-1,'no_orgasm_msg'
+			gs'arousal', 'vaginal',-1,'no_orgasm_msg'
 			gs'stat'
 			cla & *clr
 			if $booty_call['position'] = 'miss':
@@ -1597,7 +1600,7 @@ if $ARGS[0] = 'creampie_surprise_react':
 			'The sensation of cum filling your pussy is too much for you to handle and sends you over the edge.'
 			*nl
 			'Orgasmic tremors quake through your body, covering your skin in goosebumps and you moan incoherrently. You tremble, unable to do anything except quiver around the cock inside you.'
-			act'Continue':gt'booty_call_cum','creampie_surprise_cum_together'
+			act'Continue':gt'booty_call_cum', 'creampie_surprise_cum_together'
 		end
 		act'Fake an orgasm':
 			booty_call['fake_orgasm_count'] += 1
@@ -1614,18 +1617,18 @@ if $ARGS[0] = 'creampie_surprise_react':
 			'As <<$npc_firstname[$boy]>> unloads inside you, sending cum and warmth through your pussy.'
 			*nl
 			'You clench your muscles and quiver, putting on your best O-face and moan loudly, pretending that you''re coming together with him.'
-			act'Continue':gt'booty_call_cum','creampie_surprise_cum_together'
+			act'Continue':gt'booty_call_cum', 'creampie_surprise_cum_together'
 		end
 	elseif orgasm > booty_call['orgasm']:
 		act'Come with him':
 			booty_call['orgasm_count'] += 1
-			booty_call['cum_together'] = 1
+			booty_call['came_together'] = 1
 			gs'stat'
 			cla & *nl
 			'As <<$npc_firstname[$boy]>> comes inside you, you come too. Cum and warmth floods through your pussy, driving you over the edge.'
 			*nl
 			'Orgasmic tremors quake through your body, covering your skin in goosebumps and you moan incoherrently. You tremble, unable to do anything except quiver around the cock inside you.'
-			act'Continue':gt'booty_call_cum','creampie_surprise_cum_together'
+			act'Continue':gt'booty_call_cum', 'creampie_surprise_cum_together'
 		end
 	end
 end
@@ -1648,15 +1651,15 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 		'"Did... did we... did you...?" he pants.'
 	end
 
-	gs'booty_call_talk','cum_together_yeah'
-	gs'booty_call_talk','feel_full'
-	gs'booty_call_talk','love_creampies'
-	gs'booty_call_talk','creampie_ask_next_time'
-	gs'booty_call_talk','told_you_not_to_creampie'
-	gs'booty_call_talk','cum_together_kiss'
-	gs'booty_call_talk','cum_together_no_bc'
+	gs'booty_call_talk', 'cum_together_yeah'
+	gs'booty_call_talk', 'feel_full'
+	gs'booty_call_talk', 'love_creampies'
+	gs'booty_call_talk', 'creampie_ask_next_time'
+	gs'booty_call_talk', 'told_you_not_to_creampie'
+	gs'booty_call_talk', 'cum_together_kiss'
+	gs'booty_call_talk', 'cum_together_no_bc'
 	if booty_call['orgasm_count'] >= 5 or pcs_sleep < 20 and hour >= 20:
-		act'Collapse':gt'booty_call_after','black_out'
+		act'Collapse':gt'booty_call_after', 'black_out'
 	end
 end
 
@@ -1674,7 +1677,7 @@ if $ARGS[0] = 'what_now':
 		else
 			'<<$npc_firstname[$boy]>> nods in somber agreement.'
 		end
-		gs'booty_call_after','finish'
+		gs'booty_call_after', 'finish'
 	end
 	
 	act'Keep going':
@@ -1682,10 +1685,10 @@ if $ARGS[0] = 'what_now':
 		'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
 		'"Let''s keep going," you smile. "I''m not satisfied yet anyways."'
 		'"Great! Gimme a minute to get hard again," he says, working his cock, concentrating hard to try and stiffen up again.'
-		gs'booty_call_sex','reset'
+		gs'booty_call_sex', 'reset'
 		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 	
 	act'Keep going (no condoms)':
@@ -1702,10 +1705,10 @@ if $ARGS[0] = 'what_now':
 			booty_call['no_condom'] = 1
 			'<<$npc_firstname[$boy]>> grins back at you and his cock immediately starts to stiffen again, apparently getting hard just at the thought of fucking you bareback.'
 		end
-		gs'booty_call_sex','reset'
+		gs'booty_call_sex', 'reset'
 		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
 		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 end
 
@@ -1726,7 +1729,7 @@ end
 
 if $ARGS[0] = 'cum_condom':
 	cla & *clr
-	gs'cum_call','',$boy,1,3
+	gs'cum_call', '',$boy,1,3
 	$booty_call['cum_choice'] = 'condom'
 	$booty_call['last_cum'] = 'condom'
 	if $booty_call['position'] = 'miss':
@@ -1744,16 +1747,16 @@ if $ARGS[0] = 'cum_condom':
 	if condom_break > 0:
 		booty_call['broken_condom'] = 1
 		if booty_call['orgasm'] < orgasm:
-			booty_call['cum_together'] = 1
+			booty_call['came_together'] = 1
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy. It throbs inside you through the condom, causing you to come as well. You ride out your orgasms together, oblivious to everything except the pleasure.'
-			act'Continue':gs'booty_call_cum','broken_condom2'
+			act'Continue':gs'booty_call_cum', 'broken_condom2'
 		else
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy and you can feel it pulse inside you, straining against the rubber coat around it.'
-			act'Continue':gs'booty_call_cum','broken_condom1'
+			act'Continue':gs'booty_call_cum', 'broken_condom1'
 		end
 	else
 		if booty_call['orgasm'] < orgasm:
-			booty_call['cum_together'] = 1
+			booty_call['came_together'] = 1
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy. It throbs inside you through the condom, causing you to come as well. You ride out your orgasms together, oblivious to everything except the pleasure.'
 		else
 			'<<$npc_firstname[$boy]>> buries his cock inside your pussy and you can feel it pulse inside you, straining against the rubber coat around it.'
@@ -1788,14 +1791,14 @@ if $ARGS[0] = 'broken_condom1':
 				'You blink in surprise but wait patiently without making a fuss until <<$npc_firstname[$boy]>> withdraws his cock from you. The moment it slips free, something wet gushes from your pussy and you turn around to visually confirm what you suspected: the condom broke.'
 			end
 		end
-		gs'booty_call_talk','oh_shit_options'
-		gs'booty_call_talk','creampie_accident_birth_control'
+		gs'booty_call_talk', 'oh_shit_options'
+		gs'booty_call_talk', 'creampie_accident_birth_control'
 	end
 	
 	act'Come':
 		$orgasm_or = 'yes'
-		booty_call['cum_together'] = 1
-		gs'arousal','vaginal',-1,'no_orgasm_msg'
+		booty_call['came_together'] = 1
+		gs'arousal', 'vaginal',-1,'no_orgasm_msg'
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/orgasm1.mp4"></video></center>'
@@ -1820,8 +1823,8 @@ if $ARGS[0] = 'broken_condom1':
 				'Eventually your orgasm comes down and you let yourself collapse on top of <<$npc_firstname[$boy]>>, feeling your breasts pressed against his chest, which rises and falls with the same laboured breathing as your own.'
 				'"I think... the condom... broke..." you pant laying on his chest.'
 			end
-			gs'booty_call_talk','oh_shit_options'
-			gs'booty_call_talk','creampie_accident_birth_control'
+			gs'booty_call_talk', 'oh_shit_options'
+			gs'booty_call_talk', 'creampie_accident_birth_control'
 		end
 	end
 end
@@ -1854,8 +1857,8 @@ if $ARGS[0] = 'broken_condom2':
 			*nl
 			'Turning around, you look at his cock and confirm your suspicions: the condom broke.'
 		end
-		gs'booty_call_talk','oh_shit_options'
-		gs'booty_call_talk','creampie_accident_birth_control'
+		gs'booty_call_talk', 'oh_shit_options'
+		gs'booty_call_talk', 'creampie_accident_birth_control'
 	end
 end
 

+ 39 - 39
locations/booty_call_morning.qsrc

@@ -4,23 +4,23 @@ if $ARGS[0] = 'morning':
 	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
 !!{	if hangover = daystart:
 		'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover.'
-		act'<i>Ugh, my head</i>':gt'booty_call_morning','hangover'
+		act'<i>Ugh, my head</i>':gt'booty_call_morning', 'hangover'
 	else}
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
-		act'<i>Yawn</i>':gt'booty_call_morning','yawn_wake'
+		act'<i>Yawn</i>':gt'booty_call_morning', 'yawn_wake'
 !!	end
 	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
 			'Your eyes snap open. You frantically grab for your phone and turn on the screen.'
-			gs'booty_call_morning','late_for_school'
+			gs'booty_call_morning', 'late_for_school'
 		end
 	end
 	if booty_call['pass_out'] = 1:
 		
 	end
-!!	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning','guilt'
+!!	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning', 'guilt'
 end
 
 if $ARGS[0] = 'late_for_school':
@@ -39,8 +39,8 @@ if $ARGS[0] = 'late_for_school':
 	act'<i>Get dressed!</i>':
 		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
-		gs'clothing','wear_last_worn'
-		gs'underwear','wear'
+		gs'clothing', 'wear_last_worn'
+		gs'underwear', 'wear'
 		'Scrambling from the bed, you start grabbing your clothes and throwing them on as fast as you can.'
 		if PCloStyle2 = 4:
 			!! you were wearing your school uniform last night
@@ -54,7 +54,7 @@ if $ARGS[0] = 'late_for_school':
 			cla & *nl
 			'"I''m gonna be late for something!" you say hurriedly. "Gotta go!"'
 			'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
-			act'Leave':gs'booty_call_after','exit'
+			act'Leave':gs'booty_call_after', 'exit'
 		end
 
 		act'I''m gonna be late for school!':
@@ -73,7 +73,7 @@ if $ARGS[0] = 'late_for_school':
 					'"No, I''ll be okay. Thanks for the offer though." '
 					*nl
 					'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
-					act'Leave':gs'booty_call_after','exit'
+					act'Leave':gs'booty_call_after', 'exit'
 				end
 
 				act'That''d be great':
@@ -83,8 +83,8 @@ if $ARGS[0] = 'late_for_school':
 					'"Let me just get dressed."'
 					'You collect the rest of your things while he throws on some clothes and grabs his keys, then both of you head outside and climb into his car.'
 					'"Where do you want me to take you?" he asks'
-					act'Take me home':booty_call['give_lift'] = 1 & gt'booty_call_morning','give_lift'
-					act'Take me to school':booty_call['give_lift'] = 2 & gt'booty_call_morning','give_lift'
+					act'Take me home':booty_call['give_lift'] = 1 & gt'booty_call_morning', 'give_lift'
+					act'Take me to school':booty_call['give_lift'] = 2 & gt'booty_call_morning', 'give_lift'
 				end
 
 				if npc_residence[$boy] = 1:
@@ -94,7 +94,7 @@ if $ARGS[0] = 'late_for_school':
 						'"That''s okay," you shake your head. "It''s right here in the residential area. I can just walk.Thanks for the offer though."'
 						*nl
 						'With one last quick check, you make sure all your clothes are in place and call, "See you later!" over your shoulder as you rush out the door.'
-						act'Leave':gs'booty_call_after','exit'
+						act'Leave':gs'booty_call_after', 'exit'
 					end
 				end
 
@@ -104,11 +104,11 @@ if $ARGS[0] = 'late_for_school':
 					'You hesitate for a moment, considering it.'
 					*nl
 					'"No," you shake your head. "I don''t want someone seeing me get out of your car. Rumors spread like fire at my school. I can''t risk it." With one last quick check, you make sure all your clothes are in place, you shout, "See you later!" over your shoulder and rush out the door.'
-					act'Leave':gs'booty_call_after','exit'
+					act'Leave':gs'booty_call_after', 'exit'
 				end
 			else
 				'With one last quick check, you make sure all your clothes are in place and grab the rest of your things. "See you later!" you call over your shoulder as you rush out the door.'
-				act'Leave':gs'booty_call_after','exit'
+				act'Leave':gs'booty_call_after', 'exit'
 			end
 		end
 	end
@@ -129,28 +129,28 @@ if $ARGS[0] = 'yawn_wake':
 	else
 		'<b><<hour>>:<<minut>></b>'
 	end
-	gs'booty_call_morning','wakeup1'
+	gs'booty_call_morning', 'wakeup1'
 end
 
 if $ARGS[0] = 'wakeup1':
 !!	if npc_earlyriser = 1:
-!!		gt'booty_call_morning','earlyriser1'
+!!		gt'booty_call_morning', 'earlyriser1'
 !!	elseif npc_latesleeper = 1:
-!!		gt'booty_call_morning','latesleeper'
+!!		gt'booty_call_morning', 'latesleeper'
 !!	else
-	act'Prepare to leave':gt'booty_call_morning','head_out'
+	act'Prepare to leave':gt'booty_call_morning', 'head_out'
 	if $clothingworntype = 'nude':
 		act'Get dressed':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
-			gs 'shortgs','dress'
+			gs 'shortgs', 'dress'
 			'You get dressed.'
-			gs'booty_call_morning','dressing1'
+			gs'booty_call_morning', 'dressing1'
 		end
 	end
 
 	if booty_call['morning_shower'] = 0:
-		act'Head to the shower':gt'booty_call_morning','shower'
+		act'Head to the shower':gt'booty_call_morning', 'shower'
 	end
 
 !!	act'Snuggle back into bed':
@@ -174,7 +174,7 @@ if $ARGS[0] = 'wakeup2':
 		$npc_apt_bedroom[$boy]
 		'You are in <<$npc_firstname[$boy]>>''s room.'
 	end
-	gs'booty_call_morning','wakeup1'
+	gs'booty_call_morning', 'wakeup1'
 end
 
 if $ARGS[0] = 'shower':
@@ -190,14 +190,14 @@ if $ARGS[0] = 'shower':
 		dynamic $showerdin
 		*nl
 		'Feeling sufficiently awake, you turn off the tap and step out of the shower.'
-		act'Wrap yourself in a towel':gt'booty_call_morning','wakeup2'
-		act'Just dry off':booty_call['morning_shower'] = 2 & gt'booty_call_morning','wakeup2'
+		act'Wrap yourself in a towel':gt'booty_call_morning', 'wakeup2'
+		act'Just dry off':booty_call['morning_shower'] = 2 & gt'booty_call_morning', 'wakeup2'
 	end
 end
 
 if $ARGS[0] = 'head_out':
 	if $clothingworntype = 'nude':
-		gt'booty_call_morning','dressing1'
+		gt'booty_call_morning', 'dressing1'
 	else
 
 	end
@@ -261,12 +261,12 @@ if $ARGS[0] = 'dressing1':
 	end
 	'You reach down for where you left your clothes and start to pick them up.'
 	'"You heading out?" <<$npc_firstname[$boy]>> asks.'
-	gs'booty_call_after','dress_loop'
+	gs'booty_call_after', 'dress_loop'
 
 	act'Yeah':
 		cla & *nl
 		'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Thanks for letting me spend the night."'
-		gs'booty_call_after','dress_loop'
+		gs'booty_call_after', 'dress_loop'
 		if rand(1,3) = 3:
 			'"No problem. Hey, did you want to get together again later today?"'
 			act'Can''t':
@@ -274,7 +274,7 @@ if $ARGS[0] = 'dressing1':
 				'"Sorry," you say, <<$booty_call[''dress_describe'']>>. "Can''t. Got some stuff to do later. Maybe some other time."'
 				*nl
 				'<i>content author''s note: none of these options currently have any gammeplay impact :P</i>'
-				gs'booty_call_morning','end_morning'
+				gs'booty_call_morning', 'end_morning'
 			end
 
 			act'Sure':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'dressing1':
 				'"Will do."'
 				*nl
 				'<i>content author''s note: none of these options currently have any gammeplay impact :P</i>'
-				gs'booty_call_morning','end_morning'
+				gs'booty_call_morning', 'end_morning'
 			end
 
 			act'Maybe':
@@ -294,16 +294,16 @@ if $ARGS[0] = 'dressing1':
 				'"Okay, that sounds fine."'
 				*nl
 				'<i>content author''s note: none of these options currently have any gammeplay impact :P</i>'
-				gs'booty_call_morning','end_morning'
+				gs'booty_call_morning', 'end_morning'
 			end
 		else
 			'"No problem."'
-			gs'booty_call_morning','end_morning'
+			gs'booty_call_morning', 'end_morning'
 		end
 	end
 
 !!	act'Talk while you dress':
-!!		gs'booty_call_morning','dress_talk'
+!!		gs'booty_call_morning', 'dress_talk'
 !!	end
 end
 
@@ -319,7 +319,7 @@ if $ARGS[0] = 'end_morning':
 			$npc_apt_hall[$boy]
 			'"Bye then."'
 			'You gather your things and give him a wave and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
+			act'Leave':gt'booty_call_after', 'exit'
 		end
 
 		act'See ya':
@@ -327,7 +327,7 @@ if $ARGS[0] = 'end_morning':
 			$npc_apt_hall[$boy]
 			'"Well, see ya."'
 			'You gather your things and give him a wave and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
+			act'Leave':gt'booty_call_after', 'exit'
 		end
 
 		act'Blow him a kiss':
@@ -335,7 +335,7 @@ if $ARGS[0] = 'end_morning':
 			$npc_apt_hall[$boy]
 			'"Until next time."'
 			'You give him a wink and blow him a kiss and head out the door.'
-			act'Leave':gt'booty_call_after','exit'
+			act'Leave':gt'booty_call_after', 'exit'
 		end
 	end
 end
@@ -379,7 +379,7 @@ if $ARGS[0] = 'give_lift':
 			gs 'booty_call_after', 'ending'
 			$booty_call['drop_off_image']
 			'"Thanks for the ride," you say, giving him a quick smile and open up the passenger door.'
-			gs 'booty_call_morning','classmates_see'
+			gs 'booty_call_morning', 'classmates_see'
 			act'Continue':gt 'gschool_grounds', 'main'
 		end
 
@@ -388,7 +388,7 @@ if $ARGS[0] = 'give_lift':
 			gs 'booty_call_after', 'ending'
 			$booty_call['drop_off_image']
 			'"Thanks for the ride," you say, leaning over and giving him a quick peck on the cheek before opening up the passenger door.'
-			gs 'booty_call_morning','classmates_see'
+			gs 'booty_call_morning', 'classmates_see'
 			act'Continue':gt 'gschool_grounds', 'main'
 		end
 
@@ -397,7 +397,7 @@ if $ARGS[0] = 'give_lift':
 			gs 'booty_call_after', 'ending'
 			$booty_call['drop_off_image']
 			'"Thanks for the ride," you say, leaning over and giving him a quick peck on the lips before opening up the passenger door.'
-			gs 'booty_call_morning','classmates_see'
+			gs 'booty_call_morning', 'classmates_see'
 			act'Continue':gt 'gschool_grounds', 'main'
 		end
 
@@ -405,10 +405,10 @@ if $ARGS[0] = 'give_lift':
 			cla & *clr
 			gs 'booty_call_after', 'ending'
 			$booty_call['drop_off_image']
-			gs'arousal','kiss', -5
+			gs'arousal', 'kiss', -5
 			gs 'booty_call_after', 'ending'
 			'"Thanks for the ride," you say. You lean over and give him a deep kiss, forcing your tongue past his lips and enjoying the feeling of his tongue pushing past into yours. You hold the kiss for a good ten seconds before pulling away, saliva trailing with you. You wipe your mouth with a lusty grin before opening the passenger door.'
-			gs 'booty_call_morning','classmates_see'
+			gs 'booty_call_morning', 'classmates_see'
 			act'Continue':gt 'gschool_grounds', 'main'
 		end
 	else

+ 99 - 99
locations/booty_call_pillow_talk.qsrc

@@ -6,17 +6,17 @@ if $ARGS[0] = 'start':
 	booty_call['pillow_talk'] = 1
 	'You and <<$npc_firstname[$boy]>> relax on the bed together, basking in the afterglow as you idly chit chat about things.'
 	if booty_call['virgin'] = 1 and booty_call['virgin_talk'] = 0:
-		gs'booty_call_virgin','first_time_talk'
+		gs'booty_call_virgin', 'first_time_talk'
 	else
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 end
 
 if $ARGS[0] = 'topics':
-	act'Stop talking':cla & gs'booty_call_after','after_sex2'
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
 	if booty_call['angry_after'] = 0:
-!!		act'Small talk':cla & gs'booty_call_pillow_talk','small_talk'
-		act'Talk about the sex':cla & gs'booty_call_pillow_talk','sex_talk'
+!!		act'Small talk':cla & gs'booty_call_pillow_talk', 'small_talk'
+		act'Talk about the sex':cla & gs'booty_call_pillow_talk', 'sex_talk'
 	end
 end
 
@@ -25,16 +25,16 @@ end
 
 
 if $ARGS[0] = 'sex_talk':
-	act'Stop talking':cla & gs'booty_call_after','after_sex2'
-	gs'booty_call_pillow_talk','good_for_you'
-	gs'booty_call_pillow_talk','better_without'
-	gs'booty_call_pillow_talk','kuni_wear_out'
-	gs'booty_call_pillow_talk','long_time'
-	gs'booty_call_pillow_talk','ran_out_of_condoms'
-	gs'booty_call_pillow_talk','keep_it_up'
-	gs'booty_call_pillow_talk','so_many_creampies'
-	gs'booty_call_pillow_talk','broken_creampie_rule'
-	if booty_call['sleepover'] = 1:gs'booty_call_talk','morning_talk'
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
+	gs'booty_call_pillow_talk', 'good_for_you'
+	gs'booty_call_pillow_talk', 'better_without'
+	gs'booty_call_pillow_talk', 'kuni_wear_out'
+	gs'booty_call_pillow_talk', 'long_time'
+	gs'booty_call_pillow_talk', 'ran_out_of_condoms'
+	gs'booty_call_pillow_talk', 'keep_it_up'
+	gs'booty_call_pillow_talk', 'so_many_creampies'
+	gs'booty_call_pillow_talk', 'broken_creampie_rule'
+	if booty_call['sleepover'] = 1:gs'booty_call_talk', 'morning_talk'
 end
 
 if $ARGS[0] = 'good_for_you':
@@ -53,14 +53,14 @@ if $ARGS[0] = 'good_for_you':
 				else
 					'"Yeah, it was," he says. "How about you?"'
 				end
-				gs'booty_call_pillow_talk','good_for_you_too'
+				gs'booty_call_pillow_talk', 'good_for_you_too'
 			else
 				if booty_call['cum_count'] = npc_sexdrive[$boy]:
 					'"Yeah, you were great" he says. "You practically drained my balls. I might not be able to come again for a week."'
 				else
 					'"I could''ve gone a few more times," he says. "But it wasn''t bad."'
 				end
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 		end
 	end
@@ -70,20 +70,20 @@ if $ARGS[0] = 'good_for_you_too':
 	act'Satisfied':
 		cla & *nl
 		'"I had fun," you say, smiling at <<$npc_firstname[$boy]>>.'
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 	
 	if booty_call['fuck_count'] > 0:
 		act'Good dicking':
 			cla & *nl
 			'"You dicked me good," you grin back.'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Dick drunk':
 			cla & *nl
 			'"I think I''m dick drunk," you giggle, rubbing your wet thighs together.'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end		
 	end
 	
@@ -97,7 +97,7 @@ if $ARGS[0] = 'good_for_you_too':
 			else
 				'"I''m not gonna be able to walk right for a week," you grin, rubbing your thighs over your wonderfully sore pussy. "You might have fucked me bowlegged."'
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Won''t walk right (bad)':
@@ -109,21 +109,21 @@ if $ARGS[0] = 'good_for_you_too':
 			else
 				'"I''m not gonna be able to walk right for a week," you wince, rubbing your thighs over your aching pussy. "You might have fucked me bowlegged."'
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	elseif booty_call['fuck_count'] > 3:
 		act'Sore pussy (good)':
 			booty_call['sore_pussy_talk'] = 1
 			cla & *nl
 			'"We fucked so much my pussy hurts," you say with a half smile, rubbing your thighs together over your delightfully sore pussy. "But in a good way."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Sore pussy (bad)':
 			booty_call['sore_pussy_talk'] = 1
 			cla & *nl
 			'"We went a few more times than I would''ve liked," you say with a half smile, half grimace, rubbing your thighs together over your sore pussy. "My pussy kind of hurts."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
 	
@@ -131,13 +131,13 @@ if $ARGS[0] = 'good_for_you_too':
 		act'Lots of orgasms':
 			cla & *nl
 			'"You made me come so many times," you say, beaming at <<$npc_firstname[$boy]>>. "It was more than good."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	elseif booty_call['orgasm_count'] > 0:
 		act'You got me off':
 			cla & *nl
 			'"You made me come," you say, smiling at <<$npc_firstname[$boy]>>. "How could I complain?"'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
 	
@@ -150,7 +150,7 @@ if $ARGS[0] = 'good_for_you_too':
 				cla & *nl
 				'<<$npc_firstname[$boy]>>''s response makes you laugh out loud.'
 				'"That''s okay," you giggle. "I forgive you."'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 			
 			act'Roll your eyes':
@@ -158,7 +158,7 @@ if $ARGS[0] = 'good_for_you_too':
 				'<center><video autoplay loop src="images/shared/sex/after/pillow_talk_eyeroll.mp4"></video></center>'
 				'You roll your eyes to the heavens though <<$npc_firstname[$boy]>> looks quite amused by his own joke.'
 				'"You''ve endured such hardship, getting fucked by me so many times," you say flatly.'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 		end
 	end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'keep_it_up':
 			minut += 1
 			'"You can really keep it up, huh?" you say, impressed with how many times he managed to come.'
 			'"Yeah, I guess I have a pretty high sex drive. Glad that you have one to match," he smiles back.'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
 end
@@ -202,7 +202,7 @@ if $ARGS[0] = 'kuni_wear_out':
 				'"I like eating pussy," he shrugs. "I think it''s fun."'
 				'"You have a problem is what you have," you say, giving <<$npc_firstname[$boy]>> a sidelong glance as tiredness begins to sink into you.'
 			end
-			gs'booty_call_pillow_talk','sex_talk'
+			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	end
 end
@@ -216,7 +216,7 @@ if $ARGS[0] = 'long_time':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			'"Damn," you pant, reaching over to check your phone. "We were at it for a long time."'
 			'"Yeah," he grins back. "You''re just too much fun to fuck."'
-			gs'booty_call_pillow_talk','sex_talk'
+			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	end
 end
@@ -234,7 +234,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 				'"I can''t believe we used all of your condoms," you giggle, looking around at the discarded rubber sleeves littering the room.'
 			end
 			'"We fucked like crazy, didn''t we?" he nods in agreeable amusement.'
-			gs'booty_call_pillow_talk','sex_talk'
+			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	elseif booty_call['out_of_condoms'] >= 1 and booty_call['used_condoms_talk'] = 0 and booty_call['condoms_used'] < 3:
 		act'You need more condoms':
@@ -247,7 +247,7 @@ if $ARGS[0] = 'ran_out_of_condoms':
 				'"I can''t believe we used all of your condoms," you giggle, looking around at the discarded rubber sleeves littering the room.'
 			end
 			'"We fucked like crazy, didn''t we?" he nods in agreeable amusement.'
-			gs'booty_call_pillow_talk','sex_talk'
+			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	end
 end
@@ -265,31 +265,31 @@ if $ARGS[0] = 'better_without':
 						cla & *nl
 						'Your smile falters at that, reminding you again of what''s leaking out of your pussy.'
 						'<i>I hope I''ll be okay...</i> you think to yourself.'
-						gs'booty_call_pillow_talk','topics'
+						gs'booty_call_pillow_talk', 'topics'
 					end
 					if $npc_cum_pref[$boy] = 'creampie':
 						'"It was so hot watching my cum leak out of you," he grins.'
 						act'It felt good':
 							cla & *nl
 							'"It felt good," you nod agreeably. "Totally worth it."'
-							gs'booty_call_pillow_talk','topics'
+							gs'booty_call_pillow_talk', 'topics'
 						end
 					else
 						'"It felt so good when I came inside you," he smiles.'
 						act'Agree':
 							cla & *nl
 							'"It felt good for me too," you nod in agreement. "Totally worth it."'
-							gs'booty_call_pillow_talk','topics'
+							gs'booty_call_pillow_talk', 'topics'
 						end
 					end
 				elseif booty_call['dont_need_condom'] = 1:
 					'"I told you we didn''t need one," he says smugly.'
 					'"You were right," you murmur back.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				else
 					'"Yeah..." he smiles back.'
 					'"You were right," you murmur back.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			else
 				if $booty_call['cum_choice'] = 'creampie':
@@ -313,13 +313,13 @@ if $ARGS[0] = 'better_without':
 							'"Is it okay that I... you know...?" <<$npc_firstname[$boy]>> eyes your pussy, his cum still leaking from it.'
 						end
 						
-						gs 'booty_call_pillow_talk','creampie_okay'
+						gs 'booty_call_pillow_talk', 'creampie_okay'
 					elseif npc_know_bc[$boy] = 1:
 						'"But you''re on birth control, right?"'
 						'"Yeah," you nod. "So, no harm done."'
-						gs'booty_call_pillow_talk','topics'
+						gs'booty_call_pillow_talk', 'topics'
 					else
-						gs 'booty_call_pillow_talk','creampie_okay'
+						gs 'booty_call_pillow_talk', 'creampie_okay'
 					end
 
 				else
@@ -331,7 +331,7 @@ if $ARGS[0] = 'better_without':
 					act'You were right':
 						cla
 						'"I guess not," you say, smiling back.'
-						gs'booty_call_pillow_talk','topics'
+						gs'booty_call_pillow_talk', 'topics'
 					end
 
 					if booty_call['condom'] >= 2:
@@ -344,14 +344,14 @@ if $ARGS[0] = 'better_without':
 								if booty_call['promise_no_creampie'] = 1:
 									'"Hey, I promised didn''t I?"'
 									'"I know. But some guys don''t listen. I appreciate that you actually followed through."'
-									gs'booty_call_pillow_talk','topics'
+									gs'booty_call_pillow_talk', 'topics'
 								else
 									'"No problem. Though you didn''t ask me to. Would it have been a problem if I had?"'
 									act'No but thanks anyways':
 										cla & *nl
 										'"No," you shake your head. "But thanks anyways. I thought it was considerate."'
 										'You lean over, giving him a peck on the cheek.'
-										gs'booty_call_pillow_talk','topics'
+										gs'booty_call_pillow_talk', 'topics'
 									end
 
 									act'Too intimate':
@@ -360,26 +360,26 @@ if $ARGS[0] = 'better_without':
 										'"Too intimate for me," you grimace. "I have to really trust a guy before I let them do something like that, you know?"'
 										'"You should say something next time then."'
 										'"Probably," you say with an embarrassed smile. "I didn''t want to ruin the mood..."'
-										gs'booty_call_pillow_talk','topics'
+										gs'booty_call_pillow_talk', 'topics'
 									end
 									if tabletkishot > 0 or birth_control['think_safe'] = 1:
 										act'I just like being extra safe':
 											cla & *nl
 											'"No," you shake your head. "I''m on birth control so it probably would''ve been fine. I just like being extra safe."'
-											gs'booty_call_pillow_talk','topics'
+											gs'booty_call_pillow_talk', 'topics'
 										end
 
 										act'I don''t like creampies':
 											npc_dont_like_creampie[$boy] = 1
 											cla & *nl
 											'"It wouldn''t have been a ''problem''. I''m on birth control. I just don''t like getting creampied," you grimace. "It feels weird."'
-											gs'booty_call_pillow_talk','topics'
+											gs'booty_call_pillow_talk', 'topics'
 										end
 									else
 										act'I don''t like creampies':
 											cla & *nl
 											'"I don''t like getting creampied," you grimace. "It feels weird."'
-											gs'booty_call_pillow_talk','topics'
+											gs'booty_call_pillow_talk', 'topics'
 										end
 										if pillcon2 > 0 and birth_control['think_safe'] ! 1:
 											act'Birth control hasn''t kicked in':
@@ -392,19 +392,19 @@ if $ARGS[0] = 'better_without':
 													act'We''ll see':
 														cla & *nl
 														'"We''ll see," you smirk.'
-														gs'booty_call_pillow_talk','topics'
+														gs'booty_call_pillow_talk', 'topics'
 													end
 													
 													act'Me too':
 														cla & *nl
 														'"Me too," you grin back. "I want to feel my pussy overflowing with you."'
-														gs'booty_call_pillow_talk','topics'
+														gs'booty_call_pillow_talk', 'topics'
 													end
 													
 													act'Patience':
 														cla & *nl
 														'"You''ll just have to be patient," you smirk.'
-														gs'booty_call_pillow_talk','topics'
+														gs'booty_call_pillow_talk', 'topics'
 													end
 													
 													act'Gulp':
@@ -412,10 +412,10 @@ if $ARGS[0] = 'better_without':
 														'Suddenly, your throat goes dry and wetness spreads between your thighs simultaneously. The thought of his sperm filling you to the brim and overflowing from your snatch suddenly has you feeling...'
 														*nl
 														'You gulp hard, shivering as you try to suppress the arousal washing over your body.'
-														gs'booty_call_pillow_talk','topics'
+														gs'booty_call_pillow_talk', 'topics'
 													end
 												else
-													gs'booty_call_pillow_talk','topics'
+													gs'booty_call_pillow_talk', 'topics'
 												end
 											end
 										else
@@ -424,7 +424,7 @@ if $ARGS[0] = 'better_without':
 												cla & *nl
 												'"I''m not on birth control," you grimace. "Really, I shouldn''t have even taken the chance. Or I should have said something. But it turned out okay. So thanks."'
 												'You smile warmly at him.'
-												gs'booty_call_pillow_talk','topics'
+												gs'booty_call_pillow_talk', 'topics'
 											end
 										end
 									end
@@ -445,7 +445,7 @@ if $ARGS[0] = 'creampie_okay':
 		'He nods, relaxing a bit.'
 		*nl
 		'<i>I mean, what are the odds that something bad happens, right?</i>'
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 
 	act'It was worth it':
@@ -453,20 +453,20 @@ if $ARGS[0] = 'creampie_okay':
 		'"It was worth it," you grin and he smiles back at you.'
 		*nl
 		'<i>Besides, it''s just one creampie,</i> you think to yourself. <i>What''s the worst that could happen?</i>'
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 	if morning_after_pill = 0:
 		act'I''ll buy a morning after pill':
 			cla & *nl
 			'"It''s okay," you murmur reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
 			'He nods, smiling and seeming to relax a bit.'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	else
 	
 	end
 
-	gs'booty_call_pillow_talk','on_birth_control'
+	gs'booty_call_pillow_talk', 'on_birth_control'
 end
 
 if $ARGS[0] = 'on_birth_control':
@@ -481,7 +481,7 @@ if $ARGS[0] = 'on_birth_control':
 				'"It''s fine. I''m on the pill," you reassure him. "I just wanted to be extra safe. No harm done."'
 			end
 			'<<$npc_firstname[$boy]>> seems to relax, relieved that you''re not upset.'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	else
 		act'I''m on birth control (lie)':
@@ -492,13 +492,13 @@ if $ARGS[0] = 'on_birth_control':
 			'<<$npc_firstname[$boy]>> seems to relax, relieved that you''re not upset.'
 			*nl
 			'<i>I wonder if his baby is going to be swimming around inside me after this?</i>'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 
 		act'If I get pregnant, you better take responsibility (tease)':
 			cla & *nl
 			'"If I get pregnant, you better take responsibility for this," you say with a smile to let him know you''re only teasing. He seems deeply discomforted by your joke though...'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
 end
@@ -544,7 +544,7 @@ if $ARGS[0] = 'plastered':
 				'"It''s not my fault," he grumbles. "You''re the one who made me come so many times."'
 				'"But you didn''t have to get it everywhere!" you sneer back, grimacing at the slimy feeling that coats every part of you.'
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'You really plastered me (amazed)':
@@ -573,7 +573,7 @@ if $ARGS[0] = 'plastered':
 				'"It''s not my fault," he grumbles. "You''re the one who made me come so many times."'
 				'"But you didn''t have to get it everywhere!" you sneer back, grimacing at the slimy feeling that coats every part of you.'
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
 end
@@ -618,7 +618,7 @@ if $ARGS[0] = 'so_many_creampies':
 					'"I guess so," you laugh.'
 				end
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Did you have to come inside me so many times?':
@@ -644,7 +644,7 @@ if $ARGS[0] = 'so_many_creampies':
 					'"Your pussy was begging for it," he says, grinning at his handiwork.'
 				end
 			end
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 	end
@@ -666,7 +666,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 					else
 						'"<i>You</i> broke the rule!" you snap. "It''s completely your fault!"'
 					end
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			end
 			act'Regret':
@@ -678,7 +678,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 					cla & *nl
 					'"It was a one time thing," you say, half to yourself, trying to rationalize. "It was just a mistake, it won''t happen again. So it doesn''t count!"'
 					'"Sure," <<$npc_firstname[$boy]>> shrugs. "Whatever you want to tell yourself..."'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 				
 				act'I guess I''m a cheater':
@@ -687,7 +687,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 					'"I guess... I guess that makes me a cheater..." you say. Guilt and shame fill your stomach as the weight of the admission crashes down upon you.'
 					*nl
 					'What were you thinking? That this would end well?'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			end
 			
@@ -710,7 +710,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 								'"Down boy!" you giggle, pushing him playfully to the side. "I didn''t mean right now!"'
-								gs'booty_call_pillow_talk','topics'
+								gs'booty_call_pillow_talk', 'topics'
 							end
 							
 							act'No time like the present':
@@ -721,7 +721,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 							end
 						end
 					else
-						gs'booty_call_pillow_talk','topics'
+						gs'booty_call_pillow_talk', 'topics'
 					end
 				end
 				
@@ -731,7 +731,7 @@ if $ARGS[0] = 'broken_creampie_rule':
 					'"I guess that makes me a cheater," you say, your smile breaking into a full grin. Part of you knows that you should feel bad about this, but you don''t in the slightest.'
 					*nl
 					'It felt good after all. What''s wrong with feeling good?'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			end
 		end
@@ -788,7 +788,7 @@ if $ARGS[0] = 'boy_good_for_you':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	'"Was it good for you too?" <<$npc_firstname[$boy]>> asks, grinning tiredly at you.'
-	gs'booty_call_pillow_talk','good_for_you'
+	gs'booty_call_pillow_talk', 'good_for_you'
 end
 
 if $ARGS[0] = 'boy_broken_condom':
@@ -806,7 +806,7 @@ if $ARGS[0] = 'boy_broken_condom':
 				cla & *nl
 				'"It''s okay," you nod reassuringly. "I''ll get a morning after pill tomorrow. No big deal."'
 				'He smiles back, seeming to relax a bit.'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 		else
 			act'I have a pill':
@@ -814,7 +814,7 @@ if $ARGS[0] = 'boy_broken_condom':
 				booty_call['plan_b'] = 1
 				'"It''s okay," you smile. "I have a morning after pill. No big deal."'
 				'He nods, smiling and seeming to relax a bit.'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 			
 			act'Take your morning after pill (shy)':
@@ -827,7 +827,7 @@ if $ARGS[0] = 'boy_broken_condom':
 					'"The instructions say to take it as soon as possible for best effect," you smile shyly, blush intensifying as you put it in your mouth and force it down with a dry swallow.'
 				end
 				gs 'medical_din', 'morning_after_pill_function'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 			
 			act'Take your morning after pill (sexy)':
@@ -844,7 +844,7 @@ if $ARGS[0] = 'boy_broken_condom':
 					'"I''m not ready to be a mom," you smirk.'
 				end
 				gs 'medical_din', 'morning_after_pill_function'
-				gs'booty_call_pillow_talk','topics'
+				gs'booty_call_pillow_talk', 'topics'
 			end
 		end
 	end
@@ -872,10 +872,10 @@ if $ARGS[0] = 'boy_pube_talk':
 				
 				elseif npc_bush_pref[$boy] = 2:
 					'"Ever considered trimming it down?"'
-					gs'booty_call_pillow_talk','boy_asks_trim'
+					gs'booty_call_pillow_talk', 'boy_asks_trim'
 				elseif npc_bush_pref[$boy] = 3:
 					'"I think it''s sexy too," he grins. "Too many girls feel peer pressured into shaving it off, but I love a nice full bush."'
-					gs'booty_call_pillow_talk','boy_likes_bush'
+					gs'booty_call_pillow_talk', 'boy_likes_bush'
 				end
 			end
 			
@@ -920,7 +920,7 @@ if $ARGS[0] = 'boy_asks_trim':
 	act'No':
 		cla & *nl
 		'"Not really," you shrug. "Like I said, I like it this way. Why would I consider doing anything different?"'
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 	
 	act'You think I should?':
@@ -932,10 +932,10 @@ if $ARGS[0] = 'boy_asks_trim':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk3.mp4"></video></center>'
 			'"I''ll think about it," you smirk at him. "But no promises."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
-		gs'booty_call_pillow_talk','shave_for_you'
+		gs'booty_call_pillow_talk', 'shave_for_you'
 	end
 	
 	act'Get annoyed':
@@ -945,7 +945,7 @@ if $ARGS[0] = 'boy_asks_trim':
 		else
 			'"No?" you say, glaring at him. "I just told you I like it this way and it didn''t seem to be a problem with making you hard a few minutes ago."'
 		end
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 end
 
@@ -955,7 +955,7 @@ if $ARGS[0] = 'shave_for_you':
 		cla & *nl
 		'"Well..." you say. "I guess I could try it. For you."'
 		'You punctuate your promise with a gentle smile, returned with an eager grin from <<$npc_firstname[$boy]>>.'
-		gs'booty_call_pillow_talk','topics'
+		gs'booty_call_pillow_talk', 'topics'
 	end
 end
 
@@ -966,13 +966,13 @@ if $ARGS[0] = 'boy_likes_bush':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk3.mp4"></video></center>'
 			'"Well good to know," you laugh. "I''ll keep it in mind next time I look at a razor."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Glad you think so':
 			cla & *nl
 			'"I''m glad you think so," you smile. "Feels nice, knowing you think I''m sexy."'
-			gs'booty_call_pillow_talk','topics'
+			gs'booty_call_pillow_talk', 'topics'
 		end
 		
 		act'Glad I have your permission (sarcastic)':
@@ -987,7 +987,7 @@ if $ARGS[0] = 'boy_likes_bush':
 					'You immediately feel guilty and look back at him.'
 					'"I''m sorry," you say. "I... I don''t know why I snapped at you like that. You''re right. I should be happy you think I''m sexy."'
 					'You give him an apologetic smile and though <<$npc_firstname[$boy]>> still seems a little annoyed with you, he mostly calms down as well.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 				
 				act'I didn''t ask!':
@@ -997,7 +997,7 @@ if $ARGS[0] = 'boy_likes_bush':
 					'"Well I didn''t ask for your opinion!" you snap back. "It''s my body and my bush, I can do whatever I want without hearing how you feel about it!"'
 					*nl
 					'<i>Ugh! Men!</i> you grumble internally.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			else
 				'"I didn''t mean it like that," <<$npc_firstname[$boy]>> says, looking bemused at you. "I just wanted to let you know I think you''re hot."'
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'boy_likes_bush':
 					'You immediately feel guilty and look back at him.'
 					'"I''m sorry," you say. "I... I don''t know why I snapped at you like that. You''re right. I should be happy you think I''m sexy."'
 					'You give him an apologetic smile and though <<$npc_firstname[$boy]>> smiles back.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 				
 				act'I didn''t ask for a man''s opinion!':
@@ -1017,7 +1017,7 @@ if $ARGS[0] = 'boy_likes_bush':
 					'"Well I didn''t ask for your opinion!" you snap back. "It''s my body and my bush, I can do whatever I want without hearing how a man feels about it!"'
 					*nl
 					'<i>Ugh! Men!</i> you grumble internally.'
-					gs'booty_call_pillow_talk','topics'
+					gs'booty_call_pillow_talk', 'topics'
 				end
 			end
 		end
@@ -1050,16 +1050,16 @@ end
 !! -------------------------- SMALL TALK ----------------------------
 
 if $ARGS[0] = 'small_talk':
-	act'Stop talking':cla & gs'booty_call_after','after_sex2'
-	gs'booty_call_pillow_talk','weather_talk'
-	gs'booty_call_pillow_talk','better_without'
-	gs'booty_call_pillow_talk','kuni_wear_out'
-	gs'booty_call_pillow_talk','long_time'
-	gs'booty_call_pillow_talk','ran_out_of_condoms'
-	gs'booty_call_pillow_talk','keep_it_up'
-	gs'booty_call_pillow_talk','so_many_creampies'
-	gs'booty_call_pillow_talk','broken_creampie_rule'
-	if booty_call['sleepover'] = 1:gs'booty_call_talk','morning_talk'
+	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
+	gs'booty_call_pillow_talk', 'weather_talk'
+	gs'booty_call_pillow_talk', 'better_without'
+	gs'booty_call_pillow_talk', 'kuni_wear_out'
+	gs'booty_call_pillow_talk', 'long_time'
+	gs'booty_call_pillow_talk', 'ran_out_of_condoms'
+	gs'booty_call_pillow_talk', 'keep_it_up'
+	gs'booty_call_pillow_talk', 'so_many_creampies'
+	gs'booty_call_pillow_talk', 'broken_creampie_rule'
+	if booty_call['sleepover'] = 1:gs'booty_call_talk', 'morning_talk'
 end
 
 if $ARGS[0] = 'weather_talk':

+ 19 - 19
locations/booty_call_sex.qsrc

@@ -3,9 +3,9 @@
 if $ARGS[0] = 'sex_start':
 	if booty_call['no_sex'] = 0:
 		if stat['think_virgin'] = 1 and booty_call['virgin'] = 0 and booty_call['fuck_count'] = 0: 
-			act'Give him your virginity':gt'booty_call_virgin','start1'
+			act'Give him your virginity':gt'booty_call_virgin', 'start1'
 		elseif booty_call['fuck_count'] = 0:
-			act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & booty_call['fuck_now'] = 1 & gs 'booty_call_sex','sex_pre'
+			act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & booty_call['fuck_now'] = 1 & gs 'booty_call_sex', 'sex_pre'
 		else
 			act'Fuck again':
 				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['force_harden']:
@@ -182,23 +182,23 @@ end
 
 if $ARGS[0] = 'sex_end':
 	if booty_call['mad'] = 1:
-		gs'booty_call_after','bad_sex_end'
+		gs'booty_call_after', 'bad_sex_end'
 	else
-		gs'booty_call_after','stop_here'
+		gs'booty_call_after', 'stop_here'
 	end
 	if booty_call['sex_stop'] = 0:
-		gs'booty_call_after','keep_going'
-		gs'booty_call_sex','harden_hand'
-		gs'booty_call_sex','harden_mouth'
-		gs'booty_call_sex','sex_start'
+		gs'booty_call_after', 'keep_going'
+		gs'booty_call_sex', 'harden_hand'
+		gs'booty_call_sex', 'harden_mouth'
+		gs'booty_call_sex', 'sex_start'
 	end
-	if booty_call['cleanup'] = 0:gs'booty_call_after','cum_clean'
+	if booty_call['cleanup'] = 0:gs'booty_call_after', 'cum_clean'
 	if booty_call['react'] = 0:
-		gs'booty_call_after','facial_mouth_clean'
-		gs'booty_call_after','cum_kiss_cock'
-		gs'booty_call_talk','cum_react'
+		gs'booty_call_after', 'facial_mouth_clean'
+		gs'booty_call_after', 'cum_kiss_cock'
+		gs'booty_call_talk', 'cum_react'
 	end
-	gs'booty_call_after','tap_out'
+	gs'booty_call_after', 'tap_out'
 end
 
 if $ARGS[0] = 'speed_select':
@@ -286,13 +286,13 @@ if $ARGS[0] = 'harden_hand':
 				end
 				booty_call['not_done'] = 0
 				$booty_call['foreplay'] = ''
-				gs'booty_call_sex','reset'
+				gs'booty_call_sex', 'reset'
 				gs 'booty_call_start', 'handjob_dom1'
 				gs 'booty_call_start', 'foreplay_choose'
 				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
+					act'Back to sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 				else
-					gs'booty_call_sex','sex_start'
+					gs'booty_call_sex', 'sex_start'
 				end
 			end
 		end
@@ -333,13 +333,13 @@ if $ARGS[0] = 'harden_mouth':
 				end
 				booty_call['not_done'] = 0
 				$booty_call['foreplay'] = ''
-				gs'booty_call_sex','reset'
+				gs'booty_call_sex', 'reset'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
 				gs 'booty_call_start', 'foreplay_choose'
 				if booty_call['fuck_count'] > 0:
-					act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
+					act'Back to sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 				else
-					gs'booty_call_sex','sex_start'
+					gs'booty_call_sex', 'sex_start'
 				end
 			end
 		end

+ 106 - 66
locations/booty_call_start.qsrc

@@ -121,15 +121,55 @@ if $ARGS[0] = 'start':
 			act'Undress':gt 'booty_call_start', 'undress'
 		end
 !!{
-		act'Don''t ruin my makeup':
-			cla & *nl
-			if npc_apt_type[$boy] < 3:
-				'"Shut up," you say, putting your hands on his chest and pushing him inside towards the bed. "I''m here to fuck. So let''s fuck."'
-			else
-				'"Shut up," you say, putting your hands on his chest and pushing him inside towards the bedroom. "I''m here to fuck. So let''s fuck."'
-			end
-			act'Undress':gt 'booty_call_start', 'undress'
-		end}
+		if pcs_makeup > 1:
+			act'Don''t mess up my makeup':
+				booty_call['dont_ruin_makeup'] = 1
+				cla & *clr
+				$npc_apt_hall[$boy]
+				if npc_apt_type[$boy] < 3:
+					'"Don''t mess up my makeup," you say, walking past him towards the bed.'
+				else
+					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
+				end
+				if date_hour_meet <= hour + 1:
+					act'I have a date soon':
+						cla & *clr
+						$npc_apt_hall[$boy]
+						booty_call['date_soon'] = 1
+						if npc_apt_type[$boy] < 3:
+							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date right after this."'
+						else
+							'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I have a date right after this."'
+						end
+						act'Undress':gt 'booty_call_start', 'undress'
+					end
+				else
+					act'I have a date later':
+						cla & *clr
+						$npc_apt_hall[$boy]
+						booty_call['date_soon'] = 1
+						if npc_apt_type[$boy] < 3:
+							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
+						else
+							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
+						end
+						act'Undress':gt 'booty_call_start', 'undress'
+					end
+				end
+				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
+					act'I''m going to the disco':
+						cla & *clr
+						$npc_apt_hall[$boy]
+						booty_call['disco_after'] = 1
+						if npc_apt_type[$boy] < 3:
+							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I''m going to the disco after this."'
+						else
+							'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I''m going to the disco after this."'
+						end
+						act'Undress':gt 'booty_call_start', 'undress'
+					end
+				end
+			end}
 !!	act'Stumble over to the couch':gt 'booty_call_start', 'couch_start'
 	end
 end
@@ -164,7 +204,7 @@ if $ARGS[0] = 'undress':
 	'<center><video autoplay loop src="images/shared/sex/misc/undress1.mp4"></video></center>'
 	!! initiative call
 	'You tear each other''s clothes off, leaving a trail of discarded fabrics leading to the bed.'
-	gs 'booty_call_start','bed_start'
+	gs 'booty_call_start', 'bed_start'
 end
 
 if $ARGS[0] = 'bed_start':
@@ -268,9 +308,9 @@ if $ARGS[0] = 'selfish_initiative':
 			'"Okay, like what then?" he asks.'
 			gs 'booty_call_start', 'foreplay_choose'
 			if booty_call['fuck_count'] > 0:
-				act'Back to sex':cla & gs'booty_call_sex','position_change' & gs 'booty_call_condoms', 'condoms'
+				act'Back to sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 			else
-				gs'booty_call_sex','sex_start'
+				gs'booty_call_sex', 'sex_start'
 			end
 		end
 	end
@@ -380,7 +420,7 @@ if $ARGS[0] = 'cuni_alternatives':
 		gs 'booty_call_start', 'bj_dom1'
 	end
 	if stat['think_virgin'] = 1:
-		act'You can take my virginity':gt'booty_call_virgin','start2'
+		act'You can take my virginity':gt'booty_call_virgin', 'start2'
 	else
 		act'We could just skip to fucking?':
 			cla & *nl
@@ -413,9 +453,9 @@ if $ARGS[0] = 'period_lick':
 				gs 'booty_call_start', 'pussy_lick_loop'
 			else
 				if rand(0,1) = 1:
-					gs'booty_call_start','transition1'
+					gs'booty_call_start', 'transition1'
 !!				elseif booty_call['cum_count'] = 0:
-!!					gs'booty_call_start','transition2'
+!!					gs'booty_call_start', 'transition2'
 				else
 					gs 'booty_call_sex', 'sex_end'
 				end
@@ -439,9 +479,9 @@ if $ARGS[0] = 'period_lick':
 				gs 'booty_call_start', 'pussy_lick_loop'
 			else
 				if rand(0,1) = 1:
-					gs'booty_call_start','transition1'
+					gs'booty_call_start', 'transition1'
 !!				elseif booty_call['cum_count'] = 0:
-!!					gs'booty_call_start','transition2'
+!!					gs'booty_call_start', 'transition2'
 				else
 					gs 'booty_call_sex', 'sex_end'
 				end
@@ -471,9 +511,9 @@ if $ARGS[0] = 'pussy_lick':
 				gs 'booty_call_start', 'pussy_lick_loop'
 			else
 				if rand(0,1) = 1:
-					gs'booty_call_start','transition1'
+					gs'booty_call_start', 'transition1'
 !!				elseif booty_call['cum_count'] = 0:
-!!					gs'booty_call_start','transition2'
+!!					gs'booty_call_start', 'transition2'
 				else
 					gs 'booty_call_sex', 'sex_end'
 				end
@@ -497,9 +537,9 @@ if $ARGS[0] = 'pussy_lick':
 				gs 'booty_call_start', 'pussy_lick_loop'
 			else
 				if rand(0,1) = 1:
-					gs'booty_call_start','transition1'
+					gs'booty_call_start', 'transition1'
 !!				elseif booty_call['cum_count'] = 0:
-!!					gs'booty_call_start','transition2'
+!!					gs'booty_call_start', 'transition2'
 				else
 					gs 'booty_call_sex', 'sex_end'
 				end
@@ -548,8 +588,8 @@ if $ARGS[0] = 'pussy_lick_loop':
 				gs 'booty_call_sex', 'sex_start'
 			end
 		end
-		gs 'booty_call_start', 'cuni_too_sensitive'
 	end
+	gs 'booty_call_start', 'cuni_too_sensitive'
 end
 
 if $ARGS[0] = 'cuni_too_sensitive':
@@ -596,8 +636,8 @@ if $ARGS[0] = 'nipple_play':
 			booty_call['position_choose'] = 1
 			'After a few minutes, <<$npc_firstname[$boy]>> pulls back from your chest and pushes you down, climbing on top of you with his rock hard cock between your legs.'
 			if stat['think_virgin'] = 1:
-				act'Stop him':gt'booty_call_virgin','wait'
-				act'Let him take your virginity':gs'booty_call_virgin','start3'
+				act'Stop him':gt'booty_call_virgin', 'wait'
+				act'Let him take your virginity':gs'booty_call_virgin', 'start3'
 			else
 				gs 'booty_call_miss', 'missionary_start'
 				gs 'booty_call_condoms', 'condoms'
@@ -619,19 +659,19 @@ if $ARGS[0] = 'bj_ask2':
 		cla & *nl
 		booty_call['reluctant_bj'] = 1
 		'"Ugh, fiiine..." you sigh and crawl down between his legs.'
-		act'Blow him':gt'booty_call_start','bj_sub1'
+		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
 	act'Okay':
 		cla & *nl
 		'"Okay," you smile and crawl down between his legs.'
-		act'Blow him':gt'booty_call_start','bj_sub1'
+		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
 	act'Love to':
 		cla & *nl
 		'"I''d love to," you grin, licking your lips and getting some saliva going.'
-		act'Blow him':gt'booty_call_start','bj_sub1'
+		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
 !!{	if booty_call['fuck_count'] > 0:
@@ -651,7 +691,7 @@ end
 
 if $ARGS[0] = 'bj_sub1':
 	booty_call['bj_count'] += 1
-	gs'arousal','bj',rand(2,7),'no_orgasm_msg'
+	gs'arousal', 'bj',rand(2,7),'no_orgasm_msg'
 	gs'stat'
 	if booty_call['reluctant_bj'] = 1:
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj46.mp4"></video></center>'
@@ -683,7 +723,7 @@ end
 
 if $ARGS[0] = 'bj_sub2':
 	booty_call['bj_count'] += 1
-	gs'arousal','bj',rand(2,7),'no_orgasm_msg'
+	gs'arousal', 'bj',rand(2,7),'no_orgasm_msg'
 	gs'stat'
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj52.mp4"></video></center>'
 	'<<$npc_firstname[$boy]>> slowly pumps his cock in and out of your mouth, plunging it all the way down your throat where you can feel it press against your windpipe. You keep it loose while he does all the work, occasionally letting your tongue snake out for a cheekly lick, but otherwise just let <<$npc_firstname[$boy]>> keep fucking your face.'
@@ -919,7 +959,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_spit':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
 		'After a few moments, you let the cum pool to the front of your mouth and you draw yourself back up his shaft and release it from your lips, cum immediately spilling over the edge and down his cock.'
-		act'Continue':cla & gs 'booty_call_sex','sex_end'
+		act'Continue':cla & gs 'booty_call_sex', 'sex_end'
 		if booty_call['bj_cum_choice'] > 2:
 			gs 'booty_call_talk', 'bj_warning_thanks'
 		end
@@ -1412,7 +1452,7 @@ if $ARGS[0] = 'bj_force_cum_grumble':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"Hmph!" you tug your chin out of his grasp, internally grumbling to yourself, but you don''t press the issue any further.'
-		gs'booty_call_sex','sex_end'
+		gs'booty_call_sex', 'sex_end'
 		if pcs_vag ! 0 or (booty_call['virgin'] < 1 and know_virgin[$boy] < 1) and booty_call['no_sex'] ! 1:
 			act'Can we have sex now?':
 				cla & *clr
@@ -1432,7 +1472,7 @@ if $ARGS[0] = 'bj_force_cum_grumble':
 
 					act'Help him out (hand)':
 						cla & *clr
-						gs'arousal','hj',1,'no_orgasm_msg'
+						gs'arousal', 'hj',1,'no_orgasm_msg'
 						gs'stat'
 						'<center><video autoplay loop src="images/shared/sex/handjob/hj3.mp4"></video></center>'
 						'"Let me help you out with that," you smile, rolling over and taking <<$npc_firstname[$boy]>>''s dick in your hand. Even soft, you feel it twitch in response to your touch and you can''t help but smile wider at the reaction. You begin working the shaft up and down and in no time at all, you''ve got nice stiff cock ready for fucking.'
@@ -1442,7 +1482,7 @@ if $ARGS[0] = 'bj_force_cum_grumble':
 
 					act'Help him out (mouth)':
 						cla & *clr
-						gs'arousal','bj',1,'no_orgasm_msg'
+						gs'arousal', 'bj',1,'no_orgasm_msg'
 						gs'stat'
 						'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 						'"Let me help you out with that," you smile, rolling over and taking <<$npc_firstname[$boy]>>''s dick in your hand. Leaning down, you take the soft tip of his dick and place it between your lips, sucking gently. You instantly feel it twitch and you can''t help but smirk, even with a cock in your mouth.'
@@ -1454,7 +1494,7 @@ if $ARGS[0] = 'bj_force_cum_grumble':
 				else
 					'"Nah, I think I''m tapped out.'
 					act'Try to get him hard again (hand)':
-						gs'arousal','hj',rand(1,2),'no_orgasm_msg'
+						gs'arousal', 'hj',rand(1,2),'no_orgasm_msg'
 						gs'stat'
 						cla & *clr
 						if booty_call['cum_count'] >= npc_sexdrive[$boy]:
@@ -1478,7 +1518,7 @@ if $ARGS[0] = 'bj_force_cum_grumble':
 					end
 
 					act'Try to get him hard again (mouth)':
-						gs'arousal','bj',rand(1,2),'no_orgasm_msg'
+						gs'arousal', 'bj',rand(1,2),'no_orgasm_msg'
 						gs'stat'
 						if booty_call['cum_count'] >= npc_sexdrive[$boy]:
 							cla & *clr
@@ -1534,18 +1574,18 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 	if stat['think_virgin'] = 1:
 		if know_virgin[$boy] = 1:
 			'"That was great," he smiles. "That was exactly what I wanted. But I want more now."'
-			act'I''m saving my virginity':gt'booty_call_virgin','wait'
-			act'Okay (lose your virginity)':gt'booty_call_virgin','start4'
+			act'I''m saving my virginity':gt'booty_call_virgin', 'wait'
+			act'Okay (lose your virginity)':gt'booty_call_virgin', 'start4'
 		else
 			'"That was great," he smiles. "That was exactly what I wanted. But <i>now</i> I want your pussy."'
-			act'I''m saving my virginity':gt'booty_call_virgin','wait'
-			act'Okay (lose your virginity)':gt'booty_call_virgin','start3'
+			act'I''m saving my virginity':gt'booty_call_virgin', 'wait'
+			act'Okay (lose your virginity)':gt'booty_call_virgin', 'start3'
 		end
 	else
 		'"That was great," he smiles. "That was exactly what I wanted. But <i>now</i> I want your pussy."'
-		act'It''s about time':cla & booty_call['about_time'] = 1 & gs'booty_call_sex','sex_start'
+		act'It''s about time':cla & booty_call['about_time'] = 1 & gs'booty_call_sex', 'sex_start'
 		
-		act'Let him fuck you':cla & gs'booty_call_sex','sex_start'
+		act'Let him fuck you':cla & gs'booty_call_sex', 'sex_start'
 
 		act'Can we keep doing this?':
 			cla & *clr
@@ -1560,7 +1600,7 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 					'"What the fuck! You''re just gonna blue ball me like this?"'
 					'"I''m not getting off here either," you say back with irritation. "But I don''t want to fuck today and you won''t settle for a blowjob, so I guess we''re just not gonna do anything today."'
 					'"Ugh! You''re impossible!"'
-					gs'booty_call_after','quit2'
+					gs'booty_call_after', 'quit2'
 				end
 
 				act'<i>Fiiiine</i>':
@@ -1568,7 +1608,7 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 					$npc_apt_bedroom[$boy]
 					'"<i>Fiiiiine,</i>" you roll your eyes, letting out a deep breath. "Let''s get this over with then."'
 					booty_call['position_choose'] = 1
-					gs'booty_call_sex','sex_start'
+					gs'booty_call_sex', 'sex_start'
 				end
 			else
 				booty_call['not_today'] = 1
@@ -1582,7 +1622,7 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 					'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 					'"I don''t know," you shrug, continuing to play with his cock. "I''m just not in the mood. Would rather just do this."'
 					'"Well... if that''s what you want I guess," <<$npc_firstname[$boy]>> shrugs back.'
-					act'Get back to it':gt'booty_call_start','bj_resume'
+					act'Get back to it':gt'booty_call_start', 'bj_resume'
 				end
 				
 				act'I like giving head':
@@ -1596,7 +1636,7 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 						'"I''m not really in the mood to fuck right now."'
 					end
 					'"Well... if that''s what you want I guess," <<$npc_firstname[$boy]>> says leaning back as you go back to work.'
-					act'Get back to it':gt'booty_call_start','bj_resume'
+					act'Get back to it':gt'booty_call_start', 'bj_resume'
 				end
 				
 				if booty_call['fuck_count'] > 0:
@@ -1605,7 +1645,7 @@ if $ARGS[0] = 'bj_sub_lets_fuck':
 						'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 						'"My pussy needs a break," you smile gently. "I need a little more time to rest before you fuck me again."'
 						'"Well... if that''s what you want I guess," <<$npc_firstname[$boy]>> shrugs back.'
-						act'Get back to it':gt'booty_call_start','bj_resume'
+						act'Get back to it':gt'booty_call_start', 'bj_resume'
 					end
 				end
 			end
@@ -1689,8 +1729,8 @@ if $ARGS[0] = 'makeout_dom1':
 	if npc_no_kiss[$boy] ! 1:
 		act'Make out with him':
 			npc_no_kiss[$boy] = 2
-			gs'arousal','kiss',rand(2,4),'no_orgasm_msg'
-			gs'arousal','foreplay',-10,'no_orgasm_msg'
+			gs'arousal', 'kiss',rand(2,4),'no_orgasm_msg'
+			gs'arousal', 'foreplay',-10,'no_orgasm_msg'
 			gs'stat'
 			$booty_call['position'] = 'makeout'
 			cla & *clr
@@ -1707,8 +1747,8 @@ if $ARGS[0] = 'makeout_dom1':
 				'You push <<$npc_firstname[$boy]>> onto the bed, crawling over him and plunge your tongue into his mouth, kissing him with everything you''ve got while his hands roam all over your body.'
 			end
 			act'Move your hand to his cock':
-				gs'arousal','kiss',rand(2,4),'no_orgasm_msg'
-				gs'arousal','hj',-rand(2,4),'no_orgasm_msg'
+				gs'arousal', 'kiss',rand(2,4),'no_orgasm_msg'
+				gs'arousal', 'hj',-rand(2,4),'no_orgasm_msg'
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/foreplay/makeout2.mp4"></video></center>'
 				
@@ -1724,14 +1764,14 @@ if $ARGS[0] = 'makeout_dom1':
 end
 
 if $ARGS[0] = 'makeout_dom2':
-	gs'arousal','kiss',rand(2,4),'no_orgasm_msg'
+	gs'arousal', 'kiss',rand(2,4),'no_orgasm_msg'
 	gs'stat'
 	if rand(0,1) = 1:
 		'<center><video autoplay loop src="images/shared/sex/foreplay/makeout1.mp4"></video></center>'
 		'You continue making out with <<$npc_firstname[$boy]>>, loving the taste of his lips and the feel of his tongue against yours.'
 	else
 		'<center><video autoplay loop src="images/shared/sex/foreplay/grope1.mp4"></video></center>'
-		gs'arousal','foreplay',-10,'no_orgasm_msg'
+		gs'arousal', 'foreplay',-10,'no_orgasm_msg'
 		'You continue making out with <<$npc_firstname[$boy]>>, loving the taste of his lips. <<$npc_firstname[$boy]>> can''t keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.'
 	end
 	act'Keep making out':gt'booty_call_start', 'makeout_dom2'
@@ -1741,14 +1781,14 @@ if $ARGS[0] = 'makeout_dom2':
 end
 
 if $ARGS[0] = 'makeout_dom3':
-	gs'arousal','kiss',rand(2,7),'no_orgasm_msg'
-	gs'arousal','hj',-rand(2,4),'no_orgasm_msg'
+	gs'arousal', 'kiss',rand(2,7),'no_orgasm_msg'
+	gs'arousal', 'hj',-rand(2,4),'no_orgasm_msg'
 	gs'stat'
 	if rand(0,1) = 1:
 		'<center><video autoplay loop src="images/shared/sex/foreplay/makeout2.mp4"></video></center>'
 		'You continue making out with <<$npc_firstname[$boy]>> while jerking him off, loving the taste of his lips and the feel of his tongue against yours and the hard swell of his cock in your hand.'
 	else
-		gs'arousal','foreplay',-5,'no_orgasm_msg'
+		gs'arousal', 'foreplay',-5,'no_orgasm_msg'
 		'<center><video autoplay loop src="images/shared/sex/foreplay/grope1.mp4"></video></center>'
 		'You continue making out with <<$npc_firstname[$boy]>> while jerking him off, loving the taste of his lips and the hard swell of his cock in your hand. In return, <<$npc_firstname[$boy]>> can''t keep his hands off of you, endlessly groping your breasts while he continues to plunge his tongue down your throat.'
 	end
@@ -1760,7 +1800,7 @@ end
 
 if $ARGS[0] = 'handjob_dom1':
 	act'Play with his cock (hand)':
-		gs'arousal','hj',rand(1,4),'no_orgasm_msg'
+		gs'arousal', 'hj',rand(1,4),'no_orgasm_msg'
 		gs'stat'
 		$booty_call['position'] = 'handjob'
 		cla & *clr
@@ -1773,7 +1813,7 @@ if $ARGS[0] = 'handjob_dom1':
 			'You lay down beside <<$npc_firstname[$boy]>>, taking his shaft in your hand and working it with sensual tugs. He''s rock hard in your grip and he moans under your touch.'
 		end
 
-		act'Make him come in your hand':gt'booty_call_start','hj_cum1'
+		act'Make him come in your hand':gt'booty_call_start', 'hj_cum1'
 		gs 'booty_call_start', 'foreplay_choose'
 		gs 'booty_call_sex', 'sex_start'
 	end
@@ -1782,7 +1822,7 @@ end
 if $ARGS[0] = 'hj_cum1':
 	booty_call['cum_count'] += 1
 	booty_call['cum_hand'] = 1
-	gs'cum_call','hands',$boy,1
+	gs'cum_call', 'hands',$boy,1
 	cla & *clr
 	!! change media
 	'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,1.mp4"></video></center>'
@@ -1801,7 +1841,7 @@ end
 if $ARGS[0] = 'bj_dom1':
 	act'Play with his cock (mouth)':
 		$booty_call['position'] = 'blowjob_tease'
-		gs'arousal','bj',rand(2,3),'no_orgasm_msg'
+		gs'arousal', 'bj',rand(2,3),'no_orgasm_msg'
 		gs'stat'
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
@@ -1815,7 +1855,7 @@ if $ARGS[0] = 'bj_dom1':
 
 		act'Keep teasing':
 			cla & *clr
-			gs'arousal','bj',rand(1,3),'no_orgasm_msg'
+			gs'arousal', 'bj',rand(1,3),'no_orgasm_msg'
 			gs'stat'
 			'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 			if $npc_fav_pos[$boy] = 'blowjob':
@@ -1864,7 +1904,7 @@ end
 
 if $ARGS[0] = 'bj_dom2':
 	booty_call['bj_count'] += 1
-	gs'arousal','bj',rand(2,7),'no_orgasm_msg'
+	gs'arousal', 'bj',rand(2,7),'no_orgasm_msg'
 	gs'stat'
 	'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<rand(46,50)>>.mp4"></video></center>'
 	if $booty_call['position'] = 'blowjob_tease':
@@ -1897,7 +1937,7 @@ if $ARGS[0] = 'bj_dom2':
 				'"I want you to come for me <<$npc_lovername[$boy]>>," you whisper sensually. You feel him tense up and you know he''s going to blow any moment. "Come on <<$npc_lovername[$boy]>>! Come on, come on, come on, come on!"'
 			end
 			'A single pulse courses through his cock and you know he''s about to blow.'
-			act'Make him come in your hand':gt'booty_call_start','hj_cum1'
+			act'Make him come in your hand':gt'booty_call_start', 'hj_cum1'
 
 			act'Tease him to completion':gt 'booty_call_start', 'bj_dom_tease_cum'
 
@@ -1941,7 +1981,7 @@ end
 
 if $ARGS[0] = 'bj_dom_tease_cum':
 	cla & *clr
-	gs'cum_call','hands',$boy,1
+	gs'cum_call', 'hands',$boy,1
 	$booty_call['cum_choice'] = 'hand'
 	booty_call['cum_count'] += 1
 	'<center><video autoplay loop src="images/shared/sex/cum/tease_cum1.mp4"></video></center>'
@@ -1951,7 +1991,7 @@ end
 
 if $ARGS[0] = 'bj_dom_spit1':
 !!	booty_call['cum_mouth_ask'] += 1
-	gs'cum_call','mouth',$boy,1
+	gs'cum_call', 'mouth',$boy,1
 	booty_call['swallow'] = 1
 	$booty_call['cum_choice'] = 'mouth'
 	booty_call['cum_count'] += 1
@@ -1980,7 +2020,7 @@ if $ARGS[0] = 'bj_dom_swallow1':
 	'You quickly wrap your lips around his cock and plunge down as far as you can go. Not even a second later, he explodes in your mouth, shaft pulsing between your lips, warm liquid splashing against your tonsils. You hold yourself there, eyes tearing up as you let him ride out his orgasm halfway down your throat.'
 	gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 	act'Gulp':
-		gs'cum_call','mouth_swallow',$boy,1
+		gs'cum_call', 'mouth_swallow',$boy,1
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/mouth/deep2.mp4"></video></center>'
 		'Carefully, very carefully, you slowly draw your lips back up <<$npc_firstname[$boy]>>''s cock, sucking the whole time to make sure not a single drop of his cum spills around your lips. It''s really difficult to keep sucking and not choke on the cum pooling at the back of your throat. The effort makes your eyes water, but you still manage to draw all the way back up to his tip where you finally swallow his load and get your first gasp of clean air.'
@@ -2278,7 +2318,7 @@ if $ARGS[0] = 'transition1':
 			act'Blowjob':gt 'booty_call_start', 'bj_sub2'
 		end
 		if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
-			act'Take my virginity':gt'booty_call_virgin','start1'
+			act'Take my virginity':gt'booty_call_virgin', 'start1'
 		else
 			act'Fuck instead?':
 				cla & *nl

+ 37 - 33
locations/booty_call_talk.qsrc

@@ -241,7 +241,7 @@ if $ARGS[0] = 'creampie_react':
 		if booty_call['cock_remove'] ! 1:gs'booty_call_sex', 'cum_inside_pull_away'
 !!		if booty_call['creampie_surprise'] = 1:
 		if booty_call['cum_together'] > 0:
-			if booty_call['cum_together'] = 2:
+			if booty_call['came_together'] = 2:
 				act'Did we come together?':
 					cla & *clr
 					if $booty_call['position'] = 'miss':
@@ -729,7 +729,7 @@ if $ARGS[0] = 'creampie_felt_great':
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
 			if orgasm > booty_call['orgasm']:
 				!! you just came
-				if booty_call['cum_together'] = 1:
+				if booty_call['came_together'] = 1:
 					'"That was amazing," you pant, aftershocks of your orgasm still shivering through you, enjoying the feeling of cum draining from your pussy. "I could <i>feel</i> you coming inside me. It felt so good!"'
 					'<<$npc_firstname[$boy]>> just smiles tiredly back at you.'
 				else
@@ -755,7 +755,7 @@ if $ARGS[0] = 'creampie_felt_great':
 			end
 			if orgasm > booty_call['orgasm']:
 				!! you just came
-				if booty_call['cum_together'] = 1:
+				if booty_call['came_together'] = 1:
 					'"That was amazing," you pant, aftershocks of your orgasm still shivering through you, enjoying the feeling being filled by both <<$npc_firstname[$boy]>>''s cum and his cock. "I could <i>feel</i> you coming inside me. It felt so good!"'
 					'<<$npc_firstname[$boy]>> just smiles tiredly back at you.'
 					'"It was <i>amazing</i>..."'
@@ -791,9 +791,16 @@ if $ARGS[0] = 'love_creampies':
 	if booty_call['first_creampie'] ! 1:
 		act'I love creampies':
 			booty_call['react'] = 1
-			cla & *nl
+			cla & *clr
 			minut += rand(2,5)
 			gs'stat'
+			if $booty_call['position'] = 'miss':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+			elseif $booty_call['position'] = 'doggy':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+			elseif $booty_call['position'] = 'cowgirl':
+				'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+			end
 			if npc_know_love_creampie[$boy] = 1:
 				'"I love it when you come inside me," you smile.'
 				if $npc_cum_pref[$boy] = 'creampie':
@@ -877,7 +884,7 @@ if $ARGS[0] = 'creampie_wtf_image':
 end
 
 if $ARGS[0] = 'creampie_wtf':
-	if npc_creampie_okay[$boy] ! 1 and booty_call['creampie_ask'] ! 1 and booty_call['cum_together'] = 0:
+	if npc_creampie_okay[$boy] ! 1 and booty_call['creampie_ask'] ! 1 and booty_call['came_together'] = 0:
 		act'What the fuck!':
 			cla
 			booty_call['cock_remove'] = 1
@@ -1240,7 +1247,7 @@ if $ARGS[0] = 'creampie_panic':
 end
 
 if $ARGS[0] = 'cum_mouth_like_that':
-	if $booty_call['last_cum'] = 'mouth':
+	if $booty_call['last_cum'] = 'swallow':
 		act'Did you like that?':
 			cla & *nl
 			'"Did you like that?" you ask, licking your lips.'
@@ -1263,7 +1270,7 @@ if $ARGS[0] = 'cum_mouth_like_that':
 end
 
 if $ARGS[0] = 'swallow_react1':
-	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'mouth':
+	if booty_call['swallow'] = 1 or booty_call['last_cum'] = 'swallow':
 		if npc_cum_pref[$boy] = 2 and npc_cum_pref_know[$boy] = 0:
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			act'You think it''s hot?':
@@ -1312,7 +1319,7 @@ if $ARGS[0] = 'swallow_react1':
 end
 
 if $ARGS[0] = 'swallow_for_you':
-	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'mouth':
+	if booty_call['swallow'] = 1 or booty_call['last_cum'] = 'swallow':
 		act'I do it for you':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/kiss_cock.mp4"></video></center>'
@@ -1323,7 +1330,7 @@ if $ARGS[0] = 'swallow_for_you':
 end
 
 if $ARGS[0] = 'swallow_not_for_you':
-	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'mouth':
+	if booty_call['swallow'] = 1 or booty_call['last_cum'] = 'swallow':
 		act'I''m not doing it for you (I like it)':
 			cla & *nl
 			'"It''s not like I''m doing it for you," you smirk. "I like it."'
@@ -1333,7 +1340,7 @@ if $ARGS[0] = 'swallow_not_for_you':
 end
 
 if $ARGS[0] = 'spit_quit':
-	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'mouth':
+	if booty_call['swallow'] = 1 or booty_call['last_cum'] = 'swallow':
 		act'Spitting is quitting':
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -1343,7 +1350,7 @@ if $ARGS[0] = 'spit_quit':
 end
 
 if $ARGS[0] = 'cum_taste':
-	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'mouth':
+	if booty_call['swallow'] = 1 and booty_call['last_cum'] = 'swallow':
 		act'You taste good':
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -1360,20 +1367,21 @@ end
 
 if $ARGS[0] = 'facial_react1':
 	if ($booty_call['last_cum'] = 'facial' or $booty_call['last_cum'] = 'face_mouth'):
+		if $pcs_haircol = 'black':
+			$booty_call['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_black1.jpg"></center>'
+		elseif $pcs_haircol = 'brown':
+			$booty_call['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
+		elseif $pcs_haircol = 'red':
+			$booty_call['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_red1.jpg"></center>'
+		elseif $pcs_haircol = 'blonde':
+			$booty_call['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_blonde1.jpg"></center>'
+		else
+			$booty_call['facial_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
+		end
 		act'How do I look?':
 			cla & *clr
 			booty_call['react'] = 1
-			if $pcs_haircol = 'black':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_black1.jpg"></center>'
-			elseif $pcs_haircol = 'brown':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
-			elseif $pcs_haircol = 'red':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_red1.jpg"></center>'
-			elseif $pcs_haircol = 'blonde':
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_blonde1.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
-			end
+			$booty_call['facial_pic']
 			'"So, how do I look?" you ask, with a cum glazed smile.'
 			if $npc_abusive[$boy] and rand(0,1) = 1:
 				'"Like a walking cumdumpster," <<$npc_firstname[$boy]>> snickers.'
@@ -1428,6 +1436,12 @@ if $ARGS[0] = 'facial_react1':
 				gs 'booty_call_sex', 'sex_end'
 			end
 		end
+		act'It''s so warm':
+			cla & *clr
+			$booty_call['facial_pic']
+			'"It''s so warm..." you muse, <<$npc_firstname[$boy]>>''s sperm dribbling slowly down your cheeks.'
+			gs 'booty_call_sex', 'sex_end'
+		end
 		if cum_loc['hair'] > 0:
 			act'Got in my hair (annoyed)':
 				cla & *clr
@@ -1438,17 +1452,7 @@ if $ARGS[0] = 'facial_react1':
 			
 			act'Got in my hair (amused)':
 				cla & *clr
-				if $pcs_haircol = 'black':
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_black1.jpg"></center>'
-				elseif $pcs_haircol = 'brown':
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
-				elseif $pcs_haircol = 'red':
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_red1.jpg"></center>'
-				elseif $pcs_haircol = 'blonde':
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_blonde1.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_brown1.jpg"></center>'
-				end
+				$booty_call['facial_pic']
 				'"Did you have to get it in my hair?" you giggle, more amused than annoyed with the situation.'
 				gs 'booty_call_sex', 'sex_end'
 			end

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 156 - 156
locations/booty_call_virgin.qsrc


+ 1 - 1
locations/gschool_lunch.qsrc

@@ -335,7 +335,7 @@ end
 
 if $ARGS[0] = 'events':
 	menu_off = 1
-	if npc_sex['A14'] = 1 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 40 and katjaQW['horny'] > 60 and ivan_afterschool = 0:
+	if npc_sex['A14'] = 1 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 40 and min(katjaQW['horny'] ,100) > rand(60,400) and ivan_afterschool = 0:
 		cla
 		'During the break, Katja approaches you, her face flushed in a mixture of shame and what seems to be arousal. After a few seconds, she gathers enough courage to ask if you want go somewhere quiet with her.'
 		act 'Refuse': gt 'gschool_lunch', 'break'

+ 1 - 1
locations/gschool_outcast_chats.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'lesco':
 			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, he relaxes and shyly looks up at you. "What do you want?"'
 			'You shrug your shoulders, saying you just wanted to hang out. You end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He does tell you a funny story about when they were younger and things were better. Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued running and screaming all the way home.'
 		elseif npc_rel['A7'] <= 20:
-			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, When he sees you, he stiffens and looks up at you with a apprehensive expression. "Please leave me alone."'
+			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile. When he sees you, When he sees you, he stiffens and looks up at you with an apprehensive expression. "Please leave me alone."'
 			'"I just want to talk," you say softly trying to reassure him, but he isn''t buying it and you eventually give up and walk away.'
 		else
 			'You see Lesco sitting quietly by himself as usual. Feeling sorry for him, you approach with a friendly smile and strike up a conversation with him. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'

+ 42 - 34
locations/music_buskingevents.qsrc

@@ -75,65 +75,73 @@ if $ARGS[0] = 'anushka':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarf'+ rand(1,2) +'.jpg"></center>'
-	if pcs_instrmusic > 80
+	if pcs_instrmusic > 80:
 		gs 'npc_relationship', 'modify', 'A144', 'love'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was amazing, <<$pcs_nickname>>. You should come over and we can jam together some time." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "Wow, that was amazing, <<$pcs_nickname>>! You should come over and we can jam together some time."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
 			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was amazing, <<$pcs_nickname>>." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'When she notices that you saw her, she grins and walks over. "Wow, that was amazing, <<$pcs_nickname>>!"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, several leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of surprise as she bobs her head slightly to the music. You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as several leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of surprise as she bobs her head slightly to the music. You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 60
+	elseif pcs_instrmusic > 60:
 		gs 'npc_relationship', 'modify', 'A144', 'like'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was pretty damn good, <<$pcs_nickname>>. You should come over and we can jam together some time." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "That was pretty damn good, <<$pcs_nickname>>. You should come over and we can jam together some time."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she grins and walks over. "Wow that was pretty damn good, <<$pcs_nickname>>." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she grins and walks over. "That was pretty damn good, <<$pcs_nickname>>."'
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, some leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of mild surprise and respect? You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as some leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of mild surprise and respect? You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 40
+	elseif pcs_instrmusic > 40:
 		gs 'npc_relationship', 'modify', 'A144', 'like'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all. You should come over sometime and we can play together, I can give you some tips if you like." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "I didn''t know you had turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all. You should come over sometime and we can play together. I can give you some tips if you like?"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "I didn''t know you had turned into a wandering minstrel, <<$pcs_nickname>>. Not bad, not bad at all."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, some leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of mild surprise and maybe even mild approval? You know she doesn''t really like you but maybe she at least respects your ability. When she sees you looking at her and disappears into the crowd.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as some leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of mild surprise and maybe even mild approval? You know she doesn''t really like you, but maybe she at least respects your ability. When she sees you looking at her, she disappears into the crowd.'
 		end
-	elseif pcs_instrmusic > 20
+	elseif pcs_instrmusic > 20:
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "Not bad, not bad <<$pcs_nickname>> If heard better, but have heard worse too. You should come over sometime and we can play together, I can teach you a few things if you like." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "Not bad, <<$pcs_nickname>>, not bad. I''ve heard better, but also heard worse too. You should come over sometime and we can play together. I can teach you a few things if you like?"' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly.'
-			'As she notices that you saw her, she smiles and walks over. "Not bad, not bad <<$pcs_nickname>> If heard better, but have heard worse too." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a smile and a wave.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly.'
+			'When she notices that you saw her, she smiles and walks over. "Not bad, <<$pcs_nickname>>, not bad. I''ve heard better, but also heard worse too."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a smile and a wave.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, a couple leaving rubles in your case. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of disdain on her face, you know she doesn''t really like you, but had hoped she would respect your ability, maybe if you got better. When she sees you looking at her, she scoffs, followed be a smirk, as she walks away.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by as a few leave some rubles in your case. You then see some movement that attracts your attention and spot Anushka watching you play. She seems to have a look of disdain on her face; you know she doesn''t really like you, but had hoped she would respect your ability at least. When she sees you looking at her, she scoffs before walking away.'
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A144', 'dislike'
 		if npc_rel['A144'] > 50:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
-			'As she notices that you saw her, she forces a smile to her face. "What the fuck <<$pcs_nickname>>, I have heard two cats fucking that sounded more pleasant than that."'
-			'You frown a bit. "I''m trying, I''ve been practicing.'
-			*nl
-			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you are a lot better." She notices the look on your face and sighs. "Look if you want, stop by some time and I can teach you... well a lot but we will start off with just the damn basics." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away with a hint of disappointment on her face.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
+			'When she notices that you saw her, she forces a smile to her face. "You need to practice. A lot. Honestly, I wouldn''t even be playing in public with that lack of skill."'
+			'You frown. "I''m trying!"'
+			'She sighs. "Stop by some time and I can teach you the basics you need to know."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away with a hint of disappointment on her face.'
 		elseif npc_rel['A144'] > 20:
-			'As you stop playing and get ready to pack up you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
-			'As she notices that you saw her, she forces a smile to her face. "My god that physically hurt my soul it was so bad, I have heard two cats fucking that sounded more pleasant than that."'
-			'You frown a bit. "I''m trying, I''ve been practicing.'
-			*nl
-			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you are a lot better." The two of you talk for a few minutes about music, before she says she needs to get going. She walks away clearly a little disappointed in your performance.'
+			'As you stop playing and get ready to pack up, you spot Anushka standing not far from you, watching you quietly with a pained expression on her face.'
+			'When she notices that you saw her, she forces a smile to her face. "My god, that physically hurt my soul it was so bad! I''ve heard two cats fucking that sounded more pleasant than that!"'
+			'You frown. "I''m trying! I''ve been practicing!"'
+			'She shakes her head slightly. "Well you need to practice some more. Honestly you shouldn''t even play in public until you''re a lot better than that."' 
+			'The two of you talk for a few minutes about music before she says she needs to get going. She walks away clearly a little disappointed in your performance.'
 		else
-			'You start to drift loosing yourself in the music. You glance up looking at the people passing by, most seem to hurry by to try and get away from the racket you are making. You see some movement that attracts your attention and you see Anushka standing on the street watching you play. She seems to have a look of utter pain and disdain on her face, it doesn''t seem she approves of your musical talents or lack there for of. You know she doesn''t really like you, but had hoped she would respect your ability, maybe if you got better. When she sees you looking at her, she scoffs and shakes her head in disgust, as she walks away.'
+			'You start losing yourself in the music, occasionally glancing up to look at the people passing by. Most seem to hurry by to try and get away from the racket you''re making as you see some movement that attracts your attention and you spot Anushka watching you play. She seems to have a look of utter pain and disdain on her face; she clearly doesn''t approve of your lack of musical talent. When she sees you looking at her, she scoffs and shakes her head in disgust before walking away.'
 		end
 	end
 	act 'Finish': gt $loc, $loc_arg

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 185 - 192
locations/pav_aptcourtev.qsrc


+ 2 - 2
locations/pav_discoev1.qsrc

@@ -163,13 +163,13 @@ if $ARGS[0] = 'andrey_stasya_marcus':
 				act 'Get fucked':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/andreyhome/sex/4some4.jpg"></center>'
-					'After a while, the boys pull you over to the couch and lay you down next to each other. Marcus moves between your legs and quickly slides his <<dick>>cm <<$dick_girth>> dick inside you, stretching your pussy. You hear Stasya moaning and glance over to see Andrey starting to fuck her as well.'
+					'After a while, the boys pull you over to the couch and lay you down next to each other. Marcus moves between your legs and quickly slides his <<dick[2]>>cm <<$dick_girth[2]>> dick inside you, stretching your pussy. You hear Stasya moaning and glance over to see Andrey starting to fuck her as well.'
 					gs 'arousal', 'vaginal', 3, 'dick[1]', 'group'
 					gs 'stat'
 					act 'Switch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/andreyhome/sex/4some5.jpg"></center>'
-						'Several minutes go by before Andrey again tells Marcus to switch. The boys pull out and sit on the couch before Andrey pulls you over to him while Marcus does the same with Stasya. You lower yourself down until you feel Andrey''s <<dick>>cm <<$dick_girth>> dick slide inside you. He grabs your hips and pulls you all the way down until he is balls deep inside you. You glance over at Stasya moaning as Marcus penetrates her pussy as well.'
+						'Several minutes go by before Andrey again tells Marcus to switch. The boys pull out and sit on the couch before Andrey pulls you over to him while Marcus does the same with Stasya. You lower yourself down until you feel Andrey''s <<dick[1]>>cm <<$dick_girth[1]>> dick slide inside you. He grabs your hips and pulls you all the way down until he is balls deep inside you. You glance over at Stasya moaning as Marcus penetrates her pussy as well.'
 						gs 'arousal', 'vaginal', 3, 'dick[2]', 'group'
 						gs 'stat'
 						act 'In the ass':

+ 4 - 1
locations/stat_display.qsrc

@@ -903,7 +903,10 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec: minut += 2 & pcs_hairbsh = 1 & gs ''stat''"><img title="Click to brush your hair." height = <<set_siconht>> src="images/system/icons/status/hair_0.png"></a></td>'
 	end
 
-	if pcs_lipbalm > 0: $statusIconBarTab += '<td><a href="exec: ''Your lips are covered in moisturizing balm.''"><img title="You have applied lip balm." height = <<set_siconht>> src="images/system/icons/status/lipstick.png"></a></td>'
+	if pcs_lipbalm > 0:
+		$stat_lipbalm_msg = 'Your lips are covered in moisturizing balm.'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_lipbalm_msg"><img title="You have applied lip balm." height = <<set_siconht>> src="images/system/icons/status/lipstick.png"></a></td>'
+	end
 
 	if false_lashes >= 1:
 		$stat_lashes_msg = 'You''re wearing false'+iif(pcs_lashes = 4, ' mink ', ' ')+'lashes.'

+ 11 - 8
locations/stwork.qsrc

@@ -214,31 +214,34 @@ if $ARGS[0] = 'tipcalculator':
 	if striptip < 25:
 		'Nobody even noticed you or your efforts on the stage and it''s no surprise you got nothing for your efforts.'
 	elseif striptip < 40:
-		'A couple of people looked at you but nothing more than that, you didn''t receive a single tip.'
+		'A few people looked at you, but you didn''t receive a single tip.'
 	elseif striptip < 55:
-		'A couple of people looked at you but nothing more than that, you didn''t receive any tips.'
+		'A few people looked at you, but you didn''t receive any tips.'
 	elseif striptip < 70:
 		if rand(0,5) = 0:
-			'The customers were pleased with your performance, not enough to both tipping you.'
+			'The customers were pleased with your performance, but not enough to tip you.'
 		else
 			paymoneyrand = rand(3,10) * 2
 			money += paymoneyrand
 			pcs_mood += rand(1,5)
+			gs 'stat'
 			'The customers were pleased with your performance. They gave you <<paymoneyrand>> <b>₽</b> in tips.'
 		end
 	elseif striptip < 90:
 		if rand(0,10) = 0:
-			'The customers followed your movements between their conversations. You deserved some tips but luck was against you and you got nothing.'
+			'The customers followed your movements between their conversations. You deserved some tips, but luck was against you and you got nothing.'
 		else
 			paymoneyrand = rand(10,(striptip/5)) * 2
 			money += paymoneyrand
 			pcs_mood += rand(3,10)
-		'The customers followed your movements between their conversations. After counting out your tips it amounts to <<paymoneyrand>> <b>₽</b>.'
+			gs 'stat'
+		'The customers followed your movements between their conversations. After counting out your tips, it amounts to <<paymoneyrand>> <b>₽</b>.'
 		end
 	else
 		paymoneyrand = rand(20,striptip)
 		money += paymoneyrand
 		pcs_mood += rand(5,20)
+		gs 'stat'
 		'The customers were mesmerized by your dancing and tipped you <<paymoneyrand>> <b>₽</b>.'
 	end
 end
@@ -270,10 +273,10 @@ if $ARGS[0] = 'guard':
 	*clr & cla
 	gs 'stat'
 	if $clothingworntype = 'nude':
-		'The bored security guard perks up when you approach him, "Looking good there <<$pcs_nickname>>."'
+		'The bored security guard perks up when you approach him. "Looking good there, <<$pcs_nickname>>."'
 		'He doesn''t really have anything much to say and the conversation just becomes an awkward silence.'
 	else
-		'A bored looking security guard stands by the door. Seeing you, he lazily nods, "Hello <<$pcs_nickname>>."'
+		'A bored looking security guard stands by the door. Seeing you, he lazily nods. "Hello <<$pcs_nickname>>."'
 	end
 
 	act 'Move away':gt 'stwork', 'start'
@@ -289,7 +292,7 @@ if $ARGS[0] = 'toilet':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/toilet.jpg"></center>'
 	*nl
 	'You enter a dirty and smelly staff bathroom that''s probably never been cleaned.'
-	'There is no mirror, only a grimy shower, toilet, and basin'
+	'There is no mirror, only a grimy shower, toilet and basin.'
 	*nl
 	'Your razor will last <b><<stanok>></b> more ' + iif(stanok = 1, 'shave', 'shaves') + '. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 

+ 17 - 1
locations/uni_admin.qsrc

@@ -159,13 +159,29 @@ if $ARGS[0] = 'enrollment_semester':
 				!!This sets the variables such that the player is enrolled in next semester of the teaching program.
 				university['enrolled_in_semester'] += 1
 				if university['enrolled_in_semester'] = 2:
-					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
+					!!This creates the classes for the second semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'general education 102', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'teaching methods 102', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'createclass', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 3, 2, 'no', 'no', 1, 12
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'general education 102', (class['uni_teaching_studies_semester_1_general education 101_grade']/3+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'teaching methods 102', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
 					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_2', 'psychology of a student 101', 35
+				elseif university['enrolled_in_semester'] = 3:
+					!!This creates the classes for the third semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'general education 201', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'assessment 201', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_3', 'learning theories 201', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'general_education_201', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'learning theories 201', (class['uni_teaching_studies_semester_1_teaching methods 101_grade']/3+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_3', 'assessment 201', 35
+				elseif university['enrolled_in_semester'] = 4:
+					!!This creates the classes for the fourth semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'general education 202', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'learning theories 202', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'createclass', 'uni_teaching_studies_semester_4', 'psychology of a student 201', 3, 2, 'no', 'no', 1, 12
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'general education 202', ((class['uni_teaching_studies_semester_1_general education 101_grade'] + class['uni_teaching_studies_semester_2_general education 102_grade'] + class['uni_teaching_studies_semester_3_general education 201_grade'])/9+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'learning theories 202', ((class['uni_teaching_studies_semester_1_teaching methods 101_grade'] + class['uni_teaching_studies_semester_3_teaching methods 201_grade'])/6+10)
+					gs 'grades', 'grade_award', 'uni_teaching_studies_semester_4', 'psychology of a student 201', (class['uni_teaching_studies_semester_2_psychology of a student 101_grade']/3+10)
 				end
 				cla
 				'You tell her you would like to continue pursuing a teaching degree. She smiles and nods, then finishes filling out some more paperwork about the courses you can expect to take.'

+ 104 - 0
locations/uni_exams3.qsrc

@@ -0,0 +1,104 @@
+# uni_exams3
+!! Exams in this file are third semester exams for general_education, assessment, learning_theories
+!!Klim Kovalyov - General Education
+!!Grigorii Pasternak - Assessment
+!!Selena Kovalchuk - Learning Theories
+
+if $ARGS[0] = 'general_education_201':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door before turning to the class. "Today is your final exam. I hope you''ve all paid attention in my class and taken notes. Much of your grade will be decided by this one exam." As he talks, he walks around handing out the papers. Once everyone has one, he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test and may begin now."'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you are positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_3'
+		class['uni_teaching_studies_semester_3_general education 201_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_3_general education 201_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_3_general education 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_general education 201_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_3_general education 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_general education 201_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_3_general education 201_grade'']>>.'
+		else
+			'You''re sure you did extremely well and are going to get an <<$class[''uni_teaching_studies_semester_3_general education 201_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'assessment_201':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Pasternak enters the classroom and closes the door before turning to the class. "Today is your final exam. I hope you''ve all paid attention in my class and taken notes. Much of your grade will be decided by this one exam." As he talks, he walks around handing out the papers. Once everyone has one, he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test and may begin now."'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you are positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_3'
+		class['uni_teaching_studies_semester_3_assessment 201_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_3_assessment 201_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_3_assessment 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_assessment 201_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_3_assessment 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_assessment 201_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_3_assessment 201_grade'']>>.'
+		else
+			'You''re sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_3_assessment 201_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'learning_theories_201':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter. Once everyone is seated, you find an exam paper sitting on the desk waiting for you. "Today is your final exam. If you have paid attention in my class and studied, then you should have no problem passing. It is a very important exam since most of your grade is decided by this paper. Show us what you have learned." She glances to the clock on the wall. "You have three hours to complete the test and may begin now." She then takes a seat at her desk.'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you''re positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_3'
+		class['uni_teaching_studies_semester_3_learning theories 201_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_3_learning theories 201_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_3_learning theories 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_learning theories 201_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_3_learning theories 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_3_learning theories 201_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_3_learning theories 201_grade'']>>.'
+		else
+			'You''re sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_3_learning theories 201_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+--- uni_exams3 ---------------------------------
+

+ 104 - 0
locations/uni_exams4.qsrc

@@ -0,0 +1,104 @@
+# uni_exams4
+!! Exams in this file are fourth semester exams for general_education, learning_theories, psychology_of_a_student
+!!Klim Kovalyov - General Education
+!!Grigorii Pasternak - Learning Theories
+!!Selena Kovalchuk - Psychology of a Student
+
+if $ARGS[0] = 'general_education_202':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door before turning to the class. "Today is your final exam. I hope you''ve all paid attention in my class and taken notes. Much of your grade will be decided by this one exam." As he talks, he walks around handing out the papers. Once everyone has one, he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test and may begin now."'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you are positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_4'
+		class['uni_teaching_studies_semester_4_general education 202_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_4_general education 202_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_4_general education 202_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_general education 202_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_4_general education 202_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_general education 202_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_4_general education 202_grade'']>>.'
+		else
+			'You''re sure you did extremely well and are going to get an <<$class[''uni_teaching_studies_semester_4_general education 202_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'learning_theories_202':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Pasternak enters the classroom and closes the door before turning to the class. "Today is your final exam. I hope you''ve all paid attention in my class and taken notes. Much of your grade will be decided by this one exam." As he talks, he walks around handing out the papers. Once everyone has one, he walks back to the front of the class and looks at the clock on the wall. "You have three hours to complete the test and may begin now."'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you are positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_4'
+		class['uni_teaching_studies_semester_4_learning theories 202_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_4_learning theories 202_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_4_learning theories 202_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_learning theories 202_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_4_learning theories 202_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_learning theories 202_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_4_learning theories 202_grade'']>>.'
+		else
+			'You''re sure you did extremely well on the exam and is going to get an <<$class[''uni_teaching_studies_semester_4_learning theories 202_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+if $ARGS[0] = 'psychology_of_a_student_201':
+	menu_off = 1
+	*clr & cla
+	uni_period['exam'] = daystart
+	minut += 180
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter. Once everyone is seated, you find an exam paper sitting on the desk waiting for you. "Today is your final exam. If you have paid attention in my class and studied, then you should have no problem passing. It is a very important exam since most of your grade is decided by this paper. Show us what you have learned." She glances to the clock on the wall. "You have three hours to complete the test and may begin now." She then takes a seat at her desk.'
+	*nl
+	'You spend all three hours you have on the exam, doing all the parts you''re positive on before going back to the parts you''re less sure of to check them again. Once you''re happy with your work, you hand in your paper as class ends and leave.'
+	act 'Leave':
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/exam<<rand(1,3)>>.jpg"></center>'
+		*clr & cla
+		gs 'grades', 'assing_grade_description', 'uni_teaching_studies_semester_4'
+		class['uni_teaching_studies_semester_4_psychology of a student 201_exam_done'] = 1
+
+		if class['uni_teaching_studies_semester_4_psychology of a student 201_grade'] < 40:
+			'You think you''ve done terrible and are probably going to fail with <<$class[''uni_teaching_studies_semester_4_psychology of a student 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_psychology of a student 201_grade'] < 70:
+			'You think that you did good enough to pass, and are probably going to get a <<$class[''uni_teaching_studies_semester_4_psychology of a student 201_grade'']>>.'
+		elseif class['uni_teaching_studies_semester_4_psychology of a student 201_grade'] < 90:
+			'You think you did pretty well and are going to get an <<$class[''uni_teaching_studies_semester_4_psychology of a student 201_grade'']>>.'
+		else
+			'You''re sure you did extremely well and are going to get an <<$class[''uni_teaching_studies_semester_4_psychology of a student 201_grade'']>>.' 
+		end
+		act 'Go to university campus':
+			minut += 5
+			gt 'uni_grounds', 'main'
+		end
+	end
+end
+
+--- uni_exams4 ---------------------------------
+

+ 744 - 0
locations/uni_lessons3.qsrc

@@ -0,0 +1,744 @@
+# uni_lessons3
+close all
+!! classes in this file general_education_201, assessment_201, learning_theories_201
+!!Klim Kovalyov - General Education 201
+!!Grigorii Pasternak - Assessment 201
+!!Selena Kovalchuk - Learning Theories 201
+!!uni students studying to be teachers. - Igor Kruglov, Christina Zvereva, Vanya Yanka, Ekaterina "Katja" Meynold, Lebogang "Lebo" Kayode
+
+if $ARGS[0] = 'general_education_201':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_3', 'general education 201'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'general education 201', pcs_intel
+			gs 'exp_gain', 'intel', rand(0,1)
+			traits['nerd_lessons'] += 1
+			if 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. Kovalyov 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.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'general education 201', pcs_chrsm
+				gs 'exp_gain', 'intel', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Kovalyov nods approvingly, happy to see his students engaged and trying their best. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	else
+		act 'Listen attentively to Mr. Kovalyov (<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. Kovalyov''s lecture is very dry and boring. You''re having a hard time paying attention.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang and he gives you a look of disgust before turning and ignoring you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin playing a game, hoping that the boring lesson will be over soon.'
+		playphone = rand(1,2)
+		if playphone = 1:
+			'You hear Mr. Kovalyov clear his throat and glance up to see him sternly looking at you.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mr. Kovalyov then continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore him and keep using your phone as he shakes his head and goes back to his lecture.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mr. Kovalyov''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	end
+end
+
+if $ARGS[0] = 'assessment_201':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_3', 'assessment 201'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'exp_gain', 'intel', rand(0,1)
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'assessment 201', pcs_intel
+			traits['nerd_lessons'] += 1
+			if 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. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'exp_gain', 'intel', rand(1,2)
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'assessment 201', pcs_intel
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Pasternak nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+	else
+		act 'Listen attentively to Mr. Pasternak (<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. Pasternak''s lecture has fallen into a droning rhythm that has brought you, and most of your classmates, into a trance as you slowly approach the end of class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		act 'Draw dick in margin':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+			'Bored, you start doodling, which turns into you drawing dicks, complete with balls, in the margin. You even share your handiwork with the girl sitting next to you when she glances over.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+	end
+	act'Daydream':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep<<rand(1,3)>>.jpg"></center>'
+		'Mr. Pasternak is lecturing the class about exotic locations around the world. You close your eyes as you start to fantasize about these places.'
+		'You suddenly find yourself standing in front of a group of people with a globe. They tell you that you''re free to spin it and you''ll get to travel where it stops for free.'
+		*nl
+		'Full of enthusiasm, you spin it and have a hard time deciding when to stop it. When you finally decide, you notice a familiar name. Pavlovsk. To your dismay, you''ve picked your hometown. You desperately look around seeking attention, but get no response.'
+		'Just as you''re about to speak up and plead with the group, the bell rings, startling you awake.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and you try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who gives you a look of disgust and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
+		playphone = rand(1,2)
+		if playphone = 1:
+			'You hear Mr. Pasternak clear his throat and glance up to see his looking at you sternly.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore him and continue using your phone. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mr. Pasternak''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'assessment'
+		end
+	end
+end
+
+if $ARGS[0] = 'learning_theories_201':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_3', 'learning theories 201'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'exp_gain', 'intel', rand(0,1)
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'learning theories 201', pcs_intel
+			traits['nerd_lessons'] += 1
+			if 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 Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'exp_gain', 'intel', rand(1,2)
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'learning theories 201', pcs_intel
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive4.jpg"></center>'
+				'Mrs. Kovalchuk nods approvingly, always happy to see her students engaged in her class. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	else
+		act 'Listen attentively to Mrs. Kovalchuk (<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>'
+		'Mrs. Kovalchuk''s lecture has fallen into a droning rhythm that has brought you, and most of your classmates, into a trance as you slowly approach the end of the class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		act 'Draw dick in margin':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+			'Bored, you start doodling, which turns into you drawing dicks, complete with balls, in the margin. You even share your handiwork with the girl sitting next to you when she glances over.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with them. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who gives you a look of disgust and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and you spend most of the class talking quietly with each other.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
+		playphone = rand(1,4)
+		if playphone = 1:
+			'You hear Mrs. Kovalchuk clear her throat and glance up to see her looking at you sternly.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mrs. Kovalchuk shakes her head disapprovingly and continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore her and continue using your phone as she shakes her head and continues her lecture.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mrs. Kovalchuk''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	end
+end
+
+--- uni_lessons3 ---------------------------------
+

+ 744 - 0
locations/uni_lessons4.qsrc

@@ -0,0 +1,744 @@
+# uni_lessons4
+close all
+!! classes in this file general_education_202, learning_theories_202, psychology_of_a_student_201
+!!Klim Kovalyov - General Education 202
+!!Grigorii Pasternak - Learning Theories 202
+!!Selena Kovalchuk - Psychology of a Student 201
+!!uni students studying to be teachers. - Igor Kruglov, Christina Zvereva, Vanya Yanka, Ekaterina "Katja" Meynold, Lebogang "Lebo" Kayode
+
+if $ARGS[0] = 'general_education_202':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_4', 'general education 202'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'general education 202', pcs_intel
+			gs 'exp_gain', 'intel', rand(0,1)
+			traits['nerd_lessons'] += 1
+			if 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. Kovalyov 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.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'general education 202', pcs_chrsm
+				gs 'exp_gain', 'intel', rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Kovalyov nods approvingly, happy to see his students engaged and trying their best. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	else
+		act 'Listen attentively to Mr. Kovalyov (<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. Kovalyov''s lecture is very dry and boring. You''re having a hard time paying attention.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang and he gives you a look of disgust before turning and ignoring you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin playing a game, hoping that the boring lesson will be over soon.'
+		playphone = rand(1,2)
+		if playphone = 1:
+			'You hear Mr. Kovalyov clear his throat and glance up to see him sternly looking at you.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mr. Kovalyov then continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore him and keep using your phone as he shakes his head and goes back to his lecture.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mr. Kovalyov''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'general_education'
+		end
+	end
+end
+
+if $ARGS[0] = 'learning_theories_202':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_4', 'learning theories 202'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'exp_gain', 'intel', rand(0,1)
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'assessment 202', pcs_intel
+			traits['nerd_lessons'] += 1
+			if 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. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'exp_gain', 'intel', rand(1,2)
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'assessment 202', pcs_intel
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/question1.jpg"></center>'
+				'Mr. Pasternak nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	else
+		act 'Listen attentively to Mr. Pasternak (<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. Pasternak''s lecture has fallen into a droning rhythm that has brought you, and most of your classmates, into a trance as you slowly approach the end of class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		act 'Draw dick in margin':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+			'Bored, you start doodling, which turns into you drawing dicks, complete with balls, in the margin. You even share your handiwork with the girl sitting next to you when she glances over.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	end
+	act'Daydream':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/sleep<<rand(1,3)>>.jpg"></center>'
+		'Mr. Pasternak is lecturing the class about exotic locations around the world. You close your eyes as you start to fantasize about these places.'
+		'You suddenly find yourself standing in front of a group of people with a globe. They tell you that you''re free to spin it and you''ll get to travel where it stops for free.'
+		*nl
+		'Full of enthusiasm, you spin it and have a hard time deciding when to stop it. When you finally decide, you notice a familiar name. Pavlovsk. To your dismay, you''ve picked your hometown. You desperately look around seeking attention, but get no response.'
+		'Just as you''re about to speak up and plead with the group, the bell rings, startling you awake.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and you try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with each other. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who gives you a look of disgust and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
+		playphone = rand(1,2)
+		if playphone = 1:
+			'You hear Mr. Pasternak clear his throat and glance up to see his looking at you sternly.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore him and continue using your phone. Mr. Pasternak shakes his head disapprovingly and continues the lesson.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mr. Pasternak''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'learning_theories'
+		end
+	end
+end
+
+if $ARGS[0] = 'psychology_of_a_student_201':
+	menu_off = 1
+	gs 'grades', 'attend_class', 'uni_teaching_studies_semester_4', 'psychology of a student 201'
+	gs 'exp_gain', 'intel', rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+			*clr & cla
+			gs 'exp_gain', 'intel', rand(0,1)
+			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'psychology of a student 201', pcs_intel
+			traits['nerd_lessons'] += 1
+			if 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 Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				gs 'exp_gain', 'intel', rand(1,2)
+				gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'psychology of a student 201', pcs_intel
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive4.jpg"></center>'
+				'Mrs. Kovalchuk nods approvingly, always happy to see her students engaged in her class. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+			end
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+	else
+		act 'Listen attentively to Mrs. Kovalchuk (<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>'
+		'Mrs. Kovalchuk''s lecture has fallen into a droning rhythm that has brought you, and most of your classmates, into a trance as you slowly approach the end of the class.'
+		act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		act 'Draw dick in margin':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+			'Bored, you start doodling, which turns into you drawing dicks, complete with balls, in the margin. You even share your handiwork with the girl sitting next to you when she glances over.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+	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...'
+		act 'Igor':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A4', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Igor and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Igor and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A4'] <= 20:
+					'You sit next to Igor, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+		act 'Christina':
+			*clr & cla
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 200 or fame['pav_slut'] >= 200:
+				'You sit next to Christina and try to talk to her, but all she does is give you a disgusted look before moving away.'
+			else
+				'You sit next to Christina and try to talk to her, but all she does is give you a withering look of utter hatred.'
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+		act 'Vanya':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A165', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250 or fame['pav_slut'] >= 250:
+				if npc_rel['A165'] >= 60:
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him until he tells you to leave him alone.'
+				else
+					'You sit next to Vanya and try to talk to him, but he asks you to be quiet so he can focus on the lecture.'
+				end
+			else
+				if npc_rel['A4'] >= 60:
+					'You sit next to Vanya and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A165'] <= 20:
+					'You sit next to Vanya, but he dismisses all of your attempts to speak with him and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		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 fame['city_slut'] >= 150 or fame['pav_slut'] >= 150:
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Katja and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A14'] >= 60:
+					'You sit next to Katya and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A14'] <= 20:
+					'You sit next to Katja, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+		act 'Kendra':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 250:
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before a fellow student asks you to be quiet.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her until she tells you to leave her alone.'
+				else
+					'You sit next to Kendra and try to talk to her, but she asks you to be quiet so she can focus on the lecture.'
+				end
+			else
+				if npc_rel['A84'] >= 60:
+					'You sit next to Kendra and spend most of the class quietly talking with her. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A84'] <= 20:
+					'You sit next to Kendra, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and paying attention to the class instead.'
+				else
+					'You sit next to Kendra. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+		act 'Lesco':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A7', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 150:
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before a fellow student asks you to be quiet.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				else
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				end
+			else
+				if npc_rel['A7'] >= 60:
+					'You sit next to Lesco and spend most of the class quietly talking with him. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A7'] <= 20:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. After a while, you give up and focus on the lecture.'
+				else
+					'You sit next to Lesco. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before a fellow student asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+		act 'Lebogang':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A242', 'like'
+			gs 'exp_gain', 'chrsm', rand(1,2)
+			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/talk.jpg"></center>'
+			if fame['city_slut'] >= 300:
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and spend most of the class quietly talking with them. You often get shushed by your fellow students when you get a bit too loud.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who gives you a look of disgust and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			else
+				if npc_rel['A242'] >= 60:
+					'You sit next to Lebogang and you spend most of the class talking quietly with each other.'
+				elseif npc_rel['A242'] <= 20:
+					'You sit next to Lebogang, who frowns as you sit down and proceeds to ignore you. Despite your efforts, he keeps ignoring you until you give up.'
+				else
+					'You sit next to Lebogang and start talking to him. He''s more interested in the lesson than you, but slowly starts to respond to you as he takes notes.'
+				end
+			end
+			gs 'stat'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+	end
+	act'Play with your phone':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+		'You take out your phone and begin to play a game, hoping the boring lesson will be over soon.'
+		playphone = rand(1,4)
+		if playphone = 1:
+			'You hear Mrs. Kovalchuk clear her throat and glance up to see her looking at you sternly.'
+			act 'Put your phone away':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/bored.jpg"></center>'
+				'You decide not to aggravate the situation and put your phone away. Mrs. Kovalchuk shakes her head disapprovingly and continues the lesson.'
+				act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+			end
+			gs 'willpower', 'misc', 'self', 'medium'
+			if will_cost <= pcs_willpwr:
+				act 'Keep using your phone (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/phone.jpg"></center>'
+					'You ignore her and continue using your phone as she shakes her head and continues her lecture.'
+					act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+				end
+			else
+				act 'Keep using your phone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		else
+			'You play on your phone for the duration of class. You play a few games and text a few friends, all under Mrs. Kovalchuk''s oblivious nose.'
+			act 'Wait for the end of the lesson': gs 'uni_lessonsev2', 'psychology_of_a_student_201'
+		end
+	end
+end
+
+--- uni_lessons4 ---------------------------------
+

+ 173 - 0
locations/uni_lessonsev2.qsrc

@@ -0,0 +1,173 @@
+# uni_lessonsev2
+!! This file contains the class events for General Education, Teaching Methods, Learning Theories
+!!uni students studying to be teachers. - Igor Kruglov, Christina Zvereva, Vanya Yanka, Ekaterina "Katja" Meynold, Lebogang "Lebo" Kayode
+
+if $ARGS[0] = 'general_education':
+	*clr & cla
+	menu_off = 1
+	uni_event_hour = 1
+	temp = rand(1,10)
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/banana.jpg"></center>'
+		'As Mr. Kovalyov continues his lecture, you can''t help but notice how attractive he is. He has a mesmerizing smile while he talks and this seems to have an effect on the other girls, even the shy Katja. You remember she used to be quite the shy girl in school, always resisting any charm. But now... she is half finished eating her banana while listening to Mr. Kovalyov and is almost deep throating it as she eats it. Her mind is likely wandering somewhere else...'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/upskirt_pussy.jpg"></center>'
+		'It''s nearly the end of the class when you can''t help it but notice that some of the boys are twitching and whispering at each other. You curiously try to find out what the commotion could be about when you turn your head and see the reason. It''s Liliya causing some trouble again as she innocently spreads her legs just enough to tease the boys with her naked pussy.'
+		if PCloSkirt = 0 and exhibitionist_lvl > 1:
+			*nl
+			'You wonder if you should try the same thing one day...'
+		elseif PCloSkirt > 0 and 	exhibitionist_lvl > 1:
+			if $pantyworntype = 'none':
+				act 'Spread your legs':
+					*clr & cla
+					gs 'flash', 'pussy', 'inside', -5, 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/no_panties.jpg"></center>'
+					'You turn your lower body to face the boys and lift up your skirt a little. Spreading your legs, you let the boys take a good look at your pussy, feeling a thrill of excitement from the act.'
+					act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+				end
+			else
+				act 'Show your pussy':
+					*clr & cla
+					gs 'flash', 'pussy', 'inside', -5, 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/panties.jpg"></center>'
+					'You turn your lower body to face the boys and lift up your skirt a little. Spreading your legs, you pull your underwear to the side, flashing your pussy at the boys.'
+					act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+				end
+			end
+		end
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/girls_dryhump.jpg"></center>'
+		'During the halftime break, you relax as the class was pretty mentally exhausting and look around to see how others are handling all the information you are getting bombarded with. A couple of girls notice a few of the boys checking them out and start whispering back and forth while giggling before one of them grabs her friend, bends her over the table and starts to hump her hard and rough.'
+		'The second girl plays along, moaning and carrying on like she is getting fucked hard and rough, but the noise quickly draws Mr. Kovalyov''s attention, who walks over and gives the girl doing the humping some pointers with her technique, which makes her blush. The two girls share a grin at his comments and burst out laughing before they quickly stop and retake their seats. Mr. Kovalyov walks away back to the front of the classroom with an amused smile on his face.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/air_bj.jpg"></center>'
+		'You notice some of the boys whispering at each other and winking and you quickly see the reason why. Two girls seems to be bored and have decided to tease the boys with some blowjob imitation. Everything goes smoothly and according to the girl''s plans until Mr. Kovalyov nervously starts to laugh and interrupts them. "Come on girls, you two are adults now. Stop acting like you are in high school!" He then goes back to his lecture and everyone returns their attention to him.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 5:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/girls_bj.jpg"></center>'
+		'When a teacher leaves a classroom at school, chaos strikes and everybody starts to act like a child. It seems university is no different. As soon as Mr. Kovalyov leaves the classroom, you see different students talking to each other and taking selfies. However, Maya and Dasha are on top of their desks, one kneeling before the other. Dasha takes the lead and starts to shove her imaginary dick down Maya''s throat. This goes on for nearly a minute before the door opens and Mr. Kovalyov returns. Everyone quickly returns to their seats and the class quietens down.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	end
+end
+
+if $ARGS[0] = 'assessment':
+	*clr & cla
+	menu_off = 1
+	uni_event_hour = 1
+	temp = rand(1,10)
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/girl_goofing.jpg"></center>'
+		'Mr. Pasternak''s lecture is rather boring with his strict tone of teaching. In your boredom, you look around to see if anything exciting is happening, but all you see is one of your classmate making a funny face at you.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/girls_dryhump.jpg"></center>'
+		'During the halftime break, you relax as the class was pretty mentally exhausting and look around to see how others are handling all the information you are getting bombarded with. A couple of girls notice a few of the boys checking them out and start whispering back and forth while giggling before one of them grabs her friend, bends her over the table and starts to hump her hard and rough.'
+		'The second girl plays along, moaning and carrying on like she is getting fucked hard and rough, but the noise quickly draws Mr. Pasternak''s attention, who loudly clears his throat. The girls giggle but stop what they''re doing and take their seats again.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/sleeping.jpg"></center>'
+		'It''s hard to stay awake during the class and you''re not alone with this thought. You see someone has already fallen asleep on their desk.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/upskirt_panties.jpg"></center>'
+		'Everybody knows that Mr. Pasternak requires you to fully pay attention to his class, and that he doesn''t allow any type of goofing off in his class. His teaching methods are rather boring and monotone, yet it''s rare to see anyone make a scene. Today is no different than the usual, but you can''t help but notice that Liliya doesn''t give up that easily. She is eager to disturb or charm Mr. Pasternak with her pose. She is sitting in a way that Mr. Pasternak could easily see her legs spreading under the desk. As you take a sneak peek, you can see it''s a special day because she decided to wear panties this time.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 5:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/whaletail.jpg"></center>'
+        if christinaQW['subpath'] >= 3:
+			'You try to rest your head on the desk in front of you while looking around to see what the other students are doing. You quickly notice that somebody is watching you, and it''s none other than Christina! You see her looking at you in disgust as a huge whaletail peeks out of her pants. You quickly shiver at the memories of when she bullied you. Luckily for you, those times are done. You quickly take another look at her enormous whaletail and decide to continue paying attention to the lecture before you anger her.'
+			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+		elseif christinaQW['fight'] = 1:
+			'You try to rest your head on the desk in front of you while looking around to see what the other students are doing. You quickly notice that somebody is watching you, and it''s none other than Christina! You see her taunting you with a bratty face as a huge whaletail peeks out of her pants. You remember beating her up at school and smile at the memory.'
+			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+		elseif christinaQW['blackmail'] = 2:
+			'You try to rest your head on the desk in front of you while looking around to see what the other students are doing. You quickly notice that somebody is watching you, and it''s none other than Christina! You see her taunting you with a bratty face as a huge whaletail peeks out of her pants. You remember blackmailing her at school and smile at the memory.'
+			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+		else
+			'You try to rest your head on the desk in front of you while looking around to see what the other students are doing. You quickly notice that somebody is watching you, and it''s none other than Christina! You remember her being a domineering bully in school. She has a huge whaletail peeking out of her pants, probably to gain attention from all the boys around. Even you can hardly take your eyes off her thong slipping out like that. You can''t tell why, but something in her eyes and her pose intimidates you.'
+			act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	end
+end
+
+if $ARGS[0] = 'learning_theories':
+	*clr & cla
+	menu_off = 1
+	uni_event_hour = 1
+	temp = rand(1,10)
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_goofing.jpg"></center>'
+		'Mrs. Kovalchuk''s lessons are usually pretty interesting as she often interrupts herself and goes off topic talking about sci-fi or superhero movies. Sometimes a little spark of this is enough to lead the whole lecture into a discussion about her interests and everything nerdy or geeky in general. Today is no different and she speaks with a few students about the latest movie and how it could be connected to the subject. You''re free to do as you wish and a group of girls are doing just that, goofing around like they are in high school.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_kissing.jpg"></center>'
+		'During the break, most of the students just relax, but a few quietly fool around so as not to draw too much attention. A pair of girls, perhaps feeling extra brave and cheeky, start slowly but passionately kissing near the front of the class and a number of both boys and girls enjoy the show. They keep kissing until Mrs. Kovalchuk walks up to them and asks them to take their seats as she starts the second part of the class.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/sleep_selfie.jpg"></center>'
+		'It''s a normal lecture about learning theories today. They are often quite fun and interesting, but today is very dry and slow. You nearly fall asleep when you see Eva taking a picture of Liliya sleeping on her desk, nearly drooling as she dreams. You wonder if it''s because the class is so boring, or if she had an interesting and exhausting night.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/feelup_teacher.jpg"></center>'
+		'Mrs. Kovalchuk goes off topic more than usual today, talking about her latest cosplay outfit after one of the other students asks her about her latest project. She describes the outfit and the character she is going to play in great detail and one of the boys uses the opportunity to get up and join her. After asking many questions and discussing the costume, the boy comments that only fairly large and natural breasts that are still very firm could pull it off. She assures him that her breasts are real and are very firm.'
+		'He takes this as an invite to reach out and give her breasts a squeeze. She seems shocked at first, but doesn''t stop him. After a few squeezes, he seems rather impressed and nods in agreement, which gets most of the class laughing. She scolds him and sends him back to his seat before returning to her lesson.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 5:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/upskirt_no_panties.jpg"></center>'
+		'"May I use the bathroom Mrs. Kovalchuk?" you hear a girl ask and glance up to see Liliya walking towards the door to leave the classroom. Several eyes are fixated on her and she clearly enjoys the attention. With a wink and a huge smile on her face, she then lets out an innocent sounding "Oops, what''s that?" She stops and acts like she dropped something before getting down on all fours and crawling under Mrs. Kovalchuk''s desk, clearly exposing her naked ass and pussy as she does. Everybody in the classroom goes crazy and the boys start to whistle and holler. Mrs. Kovalchuk has no clue what''s going on as Liliya climbs out, fixes her dress and leaves the classroom with an even bigger smile on her face.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	end
+end
+
+if $ARGS[0] = 'psychology_of_a_student_201':
+	*clr & cla
+	menu_off = 1
+	uni_event_hour = 1
+	temp = rand(1,10)
+	if temp = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_goofing.jpg"></center>'
+		'Mrs. Kovalchuk''s lessons are usually pretty interesting as she often interrupts herself and goes off topic talking about sci-fi or superhero movies. Sometimes a little spark of this is enough to lead the whole lecture into a discussion about her interests and everything nerdy or geeky in general. Today is no different and she speaks with a few students about the latest movie and how it could be connected to the subject. You''re free to do as you wish and a group of girls are doing just that, goofing around like they are in high school.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/girls_kissing.jpg"></center>'
+		'During the break, most of the students just relax, but a few quietly fool around so as not to draw too much attention. A pair of girls, perhaps feeling extra brave and cheeky, start slowly but passionately kissing near the front of the class and a number of both boys and girls enjoy the show. They keep kissing until Mrs. Kovalchuk walks up to them and asks them to take their seats as she starts the second part of the class.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/sleep_selfie.jpg"></center>'
+		'It''s a normal lecture about learning theories today. They are often quite fun and interesting, but today is very dry and slow. You nearly fall asleep when you see Eva taking a picture of Liliya sleeping on her desk, nearly drooling as she dreams. You wonder if it''s because the class is so boring, or if she had an interesting and exhausting night.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 4:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/feelup_teacher.jpg"></center>'
+		'Mrs. Kovalchuk goes off topic more than usual today, talking about her latest cosplay outfit after one of the other students asks her about her latest project. She describes the outfit and the character she is going to play in great detail and one of the boys uses the opportunity to get up and join her. After asking many questions and discussing the costume, the boy comments that only fairly large and natural breasts that are still very firm could pull it off. She assures him that her breasts are real and are very firm.'
+		'He takes this as an invite to reach out and give her breasts a squeeze. She seems shocked at first, but doesn''t stop him. After a few squeezes, he seems rather impressed and nods in agreement, which gets most of the class laughing. She scolds him and sends him back to his seat before returning to her lesson.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	elseif temp = 5:
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/learning_theories/upskirt_no_panties.jpg"></center>'
+		'"May I use the bathroom Mrs. Kovalchuk?" you hear a girl ask and glance up to see Liliya walking towards the door to leave the classroom. Several eyes are fixated on her and she clearly enjoys the attention. With a wink and a huge smile on her face, she then lets out an innocent sounding "Oops, what''s that?" She stops and acts like she dropped something before getting down on all fours and crawling under Mrs. Kovalchuk''s desk, clearly exposing her naked ass and pussy as she does. Everybody in the classroom goes crazy and the boys start to whistle and holler. Mrs. Kovalchuk has no clue what''s going on as Liliya climbs out, fixes her dress and leaves the classroom with an even bigger smile on her face.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
+		'As you sit listening to the lesson, you look around hoping something interesting will happen, but nothing does.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
+	end
+end
+
+--- uni_lessonsev2 ---------------------------------
+

+ 437 - 3
locations/uni_programs.qsrc

@@ -117,6 +117,106 @@ if $ARGS[0] = 'uni_period_first':
 					gt 'uni_lessons2', 'teaching_methods_102'
 				end
 			end
+		elseif university['enrolled_in_semester'] = 3:
+			if $ARGS[1] = 'monday':
+				$Result = 'General Education 201 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'General Education 201 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'General Education 201 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Assessment 201 (9:00 to 10:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'general_education_201'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'general_education_201'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General Education 201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons2', 'general_education_201'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Assessment_201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'assessment_201'
+				end
+			end
+		elseif university['enrolled_in_semester'] = 4:
+			if $ARGS[1] = 'monday':
+				$Result = 'General education 202 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'General education 202 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'General education 202 (9:00 to 10:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Learning theories 202 (9:00 to 10:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General education 202 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'general_education_202'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General education 201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'general_education_202'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your General education 201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'general_education_202'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Assessment_201 class': 
+					if hour = 8: minut += 60 - minut
+					if hour = 7: minut += 120 - minut					
+					uni_period['first'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'learning_theories_202'
+				end
+			end
 		end
 	end
 end
@@ -217,6 +317,98 @@ if $ARGS[0] = 'uni_period_second':
 					gt 'uni_lessons2', 'psychology_of_a_student_101'
 				end
 			end
+		elseif university['enrolled_in_semester'] = 3:
+			if $ARGS[1] = 'monday':
+				$Result = ' Assessment 201 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'Learning Theories 201 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = ' Assessment 201 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Learning Theories 201 (11:00 to 12:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your  Assessment 201 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'assessment_201'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 201 Class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'learning_theories_201'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Assessment 201 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'assessment_201'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 201 Class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'learning_theories_201'
+				end
+			end
+		elseif university['enrolled_in_semester'] = 4:
+			if $ARGS[1] = 'monday':
+				$Result = 'Learning Theories 202 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'tuesday':
+				$Result = 'Psychology of a Student 201 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Learning Theories 202 (11:00 to 12:30)'
+			elseif $ARGS[1] = 'thursday':
+				$Result = 'Psychology of a Student 201 (11:00 to 12:30)'
+			elseif week = 1: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 202 class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'learning_theories_202'
+				end
+			elseif week = 2:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Phsychology of a Student 201 Class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'psychology_of_a_student_201'
+				end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 202 class': 
+					if hour = 10: minut += 60 - minut				
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'learning_theories_202'
+				end
+			elseif week = 4: 
+				*nl
+				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Psychology of a Student 201 Class': 
+					if hour = 10: minut += 60 - minut
+					uni_period['second'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'psychology_of_a_student_201'
+				end
+			end
 		end
 	end
 end
@@ -331,6 +523,112 @@ if $ARGS[0] = 'uni_period_third':
 				!!	gs 'stat'
 				!!end
 			end
+		elseif university['enrolled_in_semester'] = 3:
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Learning Theories 201 (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday':
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
+			elseif week = 1 and $university['elective1'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 1': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 2 and $university['elective2'] ! '':
+				!!*nl
+				!!'Your next class will start at 13:15'
+				!!act 'Go to your elective clas 2': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Learning Theories 201 Class': 
+					if hour = 12: minut += 75 - minut
+					if hour = 13 and minut < 15: minut += 15 - minut
+					uni_period['third'] = daystart
+					gs 'stat'
+					gt 'uni_lessons3', 'learning_theories_201'
+				end
+			elseif week = 4 and $university['elective3'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 3': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			end
+		elseif university['enrolled_in_semester'] = 4:
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'wednesday':
+				$Result = 'Phsychology of a Student 201 (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday':
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
+			elseif week = 1 and $university['elective1'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 1': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 2 and $university['elective2'] ! '':
+				!!*nl
+				!!'Your next class will start at 13:15'
+				!!act 'Go to your elective clas 2': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			elseif week = 3:
+				*nl
+				'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				act 'Go to your Phsychology of a Student 201 Class': 
+					if hour = 12: minut += 75 - minut
+					if hour = 13 and minut < 15: minut += 15 - minut
+					uni_period['third'] = daystart
+					gs 'stat'
+					gt 'uni_lessons4', 'psychology_of_a_student_201'
+				end
+			elseif week = 4 and $university['elective3'] ! '': 
+				!!*nl
+				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+				!!act 'Go to your elective clas 3': 
+				!!	if hour = 12: minut += 75 - minut
+				!!	if hour = 13 and minut < 15: minut += 15 - minut
+				!!	uni_period['third'] = daystart
+				!!	gs 'stat'
+				!!end
+			end
 		end
 	end
 end
@@ -469,7 +767,7 @@ if $ARGS[0] = 'exam':
 					end
 				elseif week = 4: 
 					*nl
-					'Your Psychology of a Student exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					'Your Psychology of a Student 101 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
 					act 'Go to your Psychology of a Student 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
@@ -478,9 +776,145 @@ if $ARGS[0] = 'exam':
 					end
 				end
 			end
+		elseif university['enrolled_in_semester'] = 3:
+			if $ARGS[1] = 'schedule':
+				if university['exam_week'] = 1: 
+					if week < 4 or (week = 4 and hour < 9):
+						$Result = 'General Education 201 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 102 Exam (09:00 to 12:00) Monday next week. Psychology of a Student 101 Exam (09:00 to 12:00) Thursday next week.'
+					else	
+						$Result = 'Assessment 201 Exam (09:00 to 12:00) Tuesday next week. Psychology of a Student 101  Exam (09:00 to 12:00) Thursday next week.'
+					end
+				elseif university['exam_week'] = 2: 
+					if week < 2 or (week = 2 and hour < 9):
+						$Result = 'Teaching Methods 102 Exam (09:00 to 12:00) Tuesday this week. Psychology of a Student 101 Exam (09:00 to 12:00) Thursday this week.'
+					elseif week < 4 or (week = 4 and hour < 9):
+						$Result = 'Learning Theories 201 Exam (09:00 to 12:00) Thursday this week.'
+					else
+						$Result = 'All your exams are over. Now you just have to wait for your grade to be announced.'
+					end
+				end
+			elseif $ARGS[1] = 'is_over':
+				if $ARGS[2] = 'general education 201':
+					if university['exam_week'] = 1 and (week < 4 or (week = 4 and hour < 9)):
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'Assessment 201':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 2 or (week = 2 and hour < 9))):	
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'Learning Theories 201':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 4 or (week = 4 and hour < 9))):
+						Result = 0
+					else	
+						Result = 1
+					end
+				end
+			elseif university['exam_week'] = 1: 
+				if week = 4:
+					*nl
+					'Your General Education 102 exam will start at 09:00 today. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your General Education 102 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams3', 'general_education_201'
+					end
+				end
+			elseif university['exam_week'] = 2:
+				if week = 2: 
+					*nl
+					'Your Assessment 201 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Assessment 201': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams3', 'assessment_201'
+					end
+				elseif week = 4: 
+					*nl
+					'Your Learning Theories 201 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Learning Theories 201 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams2', 'learning_theories_201'
+					end
+				end
+			end
+		elseif university['enrolled_in_semester'] = 4:
+			if $ARGS[1] = 'schedule':
+				if university['exam_week'] = 1: 
+					if week < 4 or (week = 4 and hour < 9):
+						$Result = 'General Education 202 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 102 Exam (09:00 to 12:00) Monday next week. Psychology of a Student 101 Exam (09:00 to 12:00) Thursday next week.'
+					else	
+						$Result = 'Learning Theories 202 Exam (09:00 to 12:00) Tuesday next week. Psychology of a Student 101  Exam (09:00 to 12:00) Thursday next week.'
+					end
+				elseif university['exam_week'] = 2: 
+					if week < 2 or (week = 2 and hour < 9):
+						$Result = 'Learning Theories 202 Exam (09:00 to 12:00) Tuesday this week. Psychology of a Student 101 Exam (09:00 to 12:00) Thursday this week.'
+					elseif week < 4 or (week = 4 and hour < 9):
+						$Result = 'Psychology of a Student 201 Exam (09:00 to 12:00) Thursday this week.'
+					else
+						$Result = 'All your exams are over. Now you just have to wait for your grade to be announced.'
+					end
+				end
+			elseif $ARGS[1] = 'is_over':
+				if $ARGS[2] = 'general education 202':
+					if university['exam_week'] = 1 and (week < 4 or (week = 4 and hour < 9)):
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'Learning Theories 202':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 2 or (week = 2 and hour < 9))):	
+						Result = 0
+					else	
+						Result = 1
+					end
+				elseif $ARGS[2] = 'Phsychology of a Student 201':
+					if university['exam_week'] = 1 or (university['exam_week'] = 2 and (week < 4 or (week = 4 and hour < 9))):
+						Result = 0
+					else	
+						Result = 1
+					end
+				end
+			elseif university['exam_week'] = 1: 
+				if week = 4:
+					*nl
+					'Your General Education 202 exam will start at 09:00 today. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your General Education 202 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams4', 'general_education_202'
+					end
+				end
+			elseif university['exam_week'] = 2:
+				if week = 2: 
+					*nl
+					'Your Learning Theories 202 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Learning Theories 202': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams4', 'learning_theories_202'
+					end
+				elseif week = 4: 
+					*nl
+					'Your Psychology of a Student 201 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Psychology of a Student 201 exam': 
+						if hour = 8: minut += 60 - minut
+						if hour = 7: minut += 120 - minut					
+						gs 'stat'
+						gt 'uni_exams2', 'psychology_of_a_student_201'
+					end
+				end
+			end
 		end
-
-
 	end
 end
 

+ 66 - 4
locations/wardrobe.qsrc

@@ -40,6 +40,7 @@ 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'
@@ -155,6 +156,7 @@ if $ARGS[0] = 'main':
 	*nl
 	'<center><font color="grey">Save/load outfits with "Managed saved clothing sets".</font></center>'
 	'<TD></center></TD></table></center>'
+	
 	act 'Close wardrobe': gt $loc, $loc_arg
 
 	act 'Strip all clothing':
@@ -267,7 +269,16 @@ $default_clothing_line = {
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_wear'', <<default_entry>>"><img src="images/system/icons/clothing/wear.png"></a></TD>'
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_set'', <<default_entry>>"><img src="images/system/icons/clothing/overwrite.png"></a></TD>'
 	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_rename'', <<default_entry>>"><img src="images/system/icons/clothing/rename.png"></a></TD>'
-	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<default_entry>>"><img src="images/system/icons/clothing/delete_on.png"></a></TD><TR>'
+	$RESULT +='<TD><a href="exec:gs ''wardrobe'', ''default_entry_delete'', <<default_entry>>"><img src="images/system/icons/clothing/delete_on.png"></a></TD>'
+	if $defshoetype[default_entry] = 'danilovich' and $defclothingtype[default_entry] = 'danilovich_outfits':
+		if default_sport_number ! default_entry:
+			$RESULT += '<TD><a href="exec:gs ''wardrobe'', ''default_sport_set'', <<default_entry>>"><img src="images/system/icons/clothing/sport_off.png"></a></TD><TR>'
+		else
+			$RESULT += '<TD><img src="images/system/icons/clothing/sport.png"></TD><TR>'
+		end
+	else
+		$RESULT += '<TD></TD><TR>'
+	end
 }
 
 
@@ -302,7 +313,7 @@ if $ARGS[0] = 'default_template':
 	'<center><<$wardrobeSetDefault>></center>'
     killvar '$wardrobeSetDefault'
 
-    '<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra/Bodysuit</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
+    '<center><table><TH>Name</TH><TH>Outfit</TH><TH>Bra/Bodysuit</TH><TH>Panties</TH><TH>Shoes</TH><TH>Coat</TH><TH>Purse</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TR>'
 
 	temp = default_entry
 	:loopdefault_entry_set
@@ -788,8 +799,8 @@ if $ARGS[0] = 'default_entry_delete':
 	$defclothingtype[i] = ''
 	defclothingnumber[i] = ''
 	defunderwear[i] = ''
-	$defbodysuittype = ''
-	defbodysuitnumber = ''
+	$defbodysuittype[i] = ''
+	defbodysuitnumber[i] = ''
 	$defbratype[i] = ''
 	defbranumber[i] = ''
 	$defpantytype[i] = ''
@@ -804,6 +815,12 @@ if $ARGS[0] = 'default_entry_delete':
 	gt 'wardrobe', $wloc
 end
 
+if $ARGS[0] = 'default_sport_set':
+	gs 'stat'
+	default_sport_number = ARGS[1]
+	gt 'wardrobe', $wloc
+end
+
 if $ARGS[0] = 'school_outfit':
 	! if they have worn a uniform recently we will use that rather than the one in the outfit
 	if schtype ! 0:	
@@ -846,5 +863,50 @@ if $ARGS[0] = 'school_outfit_end':
 	gs 'clothing', 'wear', $schbrand, schtype
 end
 
+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:
+			act'Put on your sports clothes':
+				$lastwornclothingtype['sport'] = $clothingworntype
+				lastwornclothingnumber['sport'] = clothingwornnumber
+				lastwornunderwear['sport'] = underwear['type']
+				if defunderwear[default_sport_number] = 2:
+					$defbodysuittype['sport'] = $bodysuitworntype
+					defbodysuitnumber['sport'] = bodysuitwornnumber
+				else
+					$lastwornpantytype['sport'] = $pantyworntype
+					lastwornpantynumber['sport'] = pantywornnumber
+					$lastwornbratype['sport'] = $braworntype
+					lastwornbranumber['sport'] = brawornnumber
+				end
+				$shoelastworntype['sport'] = $shoeworntype
+				shoelastwornnumber['sport'] = shoewornnumber
+				$lastwornpursetype['sport'] = $currentpursetype
+				lastworndefpursenumber['sport'] = currentpursenumber
+				$lastworncoattype['sport'] = $coatworntype
+				lastworndefcoatnumber['sport'] = coatwornnumber
+				gs 'wardrobe', 'default_entry_wear', default_sport_number
+			end
+		else
+			act'Put your regular clothes back on':
+				gs 'clothing', 'wear', $lastwornclothingtype['sport'], lastwornclothingnumber['sport']
+
+				if lastwornunderwear['sport'] = 2:
+					gs 'underwear_bodysuits', 'wear', $defbodysuittype['sport'], defbodysuitnumber['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', $shoelastworntype['sport'], shoelastwornnumber['sport']
+			end
+		end
+	end
+end
+
+
 --- wardrobe ---------------------------------
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio