Browse Source

[added] Added Katja telling you that she is going to the university and the ability to tell her that you are going to the university. In preparation for her university content.

bgkjdgbizgblzdgbr 2 years ago
parent
commit
ec14469417
3 changed files with 170 additions and 63 deletions
  1. 117 58
      locations/KatjaHomeTalk.qsrc
  2. 35 3
      locations/pav_beach_chat.qsrc
  3. 18 2
      locations/pav_disco_coolkids.qsrc

+ 117 - 58
locations/KatjaHomeTalk.qsrc

@@ -9,6 +9,7 @@
 !! katjaQW['QWstage'] = 4 Katja have asked you to helpe 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.
 
 !! katjaQW['anal_quest'] =1 Katja has asked you to help her have anal sex with a boy.
 !! katjaQW['anal_quest'] =2 You have agreed to help Katja have anal sex with a boy.
@@ -69,6 +70,10 @@
 !! 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['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.
+
 if $ARGS[0] = 'cikl':
 	!!Modifying Katja''s arousal level.
 	if katjaQW['QWstage'] > 2:
@@ -141,75 +146,81 @@ if $ARGS[0] = '':
 		else
 			!!not sweaty
 
-			if katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
-				!!If Katja have had sex with both marcus and Ivan and have been corrupted enough. Then she will when she is horny ask about trying sex with other boys. 
-				gt 'KatjaHomeTalk', 'random_park_sex_talk'
+			if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+				!!Katja tells you that she has enrolled in the university.
+				gt 'KatjaHomeTalk',  'katja_uni_tell'
+
+			else
+				if katjaQW['QWstage'] = 6 and katjaQW['anal_quest'] >= 3 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
+					!!If Katja have had sex with both marcus and Ivan and have been corrupted enough. Then she will when she is horny ask about trying sex with other boys. 
+					gt 'KatjaHomeTalk', 'random_park_sex_talk'
 			
-			elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_pussy'] > 0: 
-				!!If Katja have has had her first time wiht Marcus she will discuss this the next time the player talks to her at home
+				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_pussy'] > 0: 
+					!!If Katja have has had her first time wiht Marcus she will discuss this the next time the player talks to her at home
 				gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
 			
-			elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1: 
-				!!If Marcus have agreed to be katja''s first, the player will tell this to Katja the next time the talk at home
-				gt 'KatjaHomeTalk', 'Marcus_answer_talk'
+				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1: 
+					!!If Marcus have agreed to be katja''s first, the player will tell this to Katja the next time the talk at home
+					gt 'KatjaHomeTalk', 'Marcus_answer_talk'
 			
-			elseif katjaQW['QWstage'] < 4 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_sex']) >= 2 and npc_sex['A14'] > 0:
-				!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boyu. She will if she is horny ask the player to help her arange her first time with a boy.
-				gt 'KatjaHomeTalk', 'sex_with_boy_ask'
+				elseif katjaQW['QWstage'] < 4 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_sex']) >= 2 and npc_sex['A14'] > 0:
+					!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boyu. She will if she is horny ask the player to help her arange her first time with a boy.
+					gt 'KatjaHomeTalk', 'sex_with_boy_ask'
 			
-			else
-				if katjaQW['slut'] >= 60 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_anal']) >= 2 and npc_sex['A14'] > 0 and katjaQW['anal_quest'] = 0: 
-					!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arange her first time with a boy.
-					gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
-				
 				else
-					if katjaQW['horny'] > rand(40,120):
-						!!If katja is very horny she will start a sexual encounter wiht the player, which depends on how long you are in her questline
-						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
-							gt 'katjaHomeTalk', 'marcus_kiss' 
+					if katjaQW['slut'] >= 60 and katjaQW['horny'] >= 40 and (katjaQW['knows_BJ'] + katjaQW['knows_anal']) >= 2 and npc_sex['A14'] > 0 and katjaQW['anal_quest'] = 0: 
+						!!If Katja have been corrupted enough, have had sex with the player and know that the player have both given blow jobs and have had vaginal sex with a boy. She will if she is horny ask the player to help her arange her first time with a boy.
+						gt 'KatjaHomeTalk', 'anal_sex_with_boy_ask'
+				
+					else
+						if katjaQW['horny'] > rand(40,120):
+							!!If katja is very horny she will start a sexual encounter wiht the player, which depends on how long you are in her questline
+							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
+								gt 'katjaHomeTalk', 'marcus_kiss' 
 						
-						elseif katjaQW['QWstage'] > 2:
-							!!The standard start of her sex scenes at home. Happens if the marcus ask do not trigger and Katja have kissed the player.
-							gt 'KatjaHomeTalk', 'hornykiss'
+							elseif katjaQW['QWstage'] > 2:
+								!!The standard start of her sex scenes at home. Happens if the marcus ask do not trigger and Katja have kissed the player.
+								gt 'KatjaHomeTalk', 'hornykiss'
 						
-						else
-							!!This only triggers if the player have never kissed Katja.
-							gt 'KatjaHomeTalk', 'tender_kiss'
-						end
+							else
+								!!This only triggers if the player have never kissed Katja.
+								gt 'KatjaHomeTalk', 'tender_kiss'
+							end
 					
-					else 
-						if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
-							!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
-							if kid > 0:
-								cla
-								gs 'stat'
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"You''re pregnant again?" Her face turns red and her expression is far angrier than you''ve ever seen her. "After everything, you still didn''t trust me enough to tell me?" she screams at you. "I thought there was something special between us." Tears begin rolling down her cheeks. "Just leave me alone, I don''t even want to see you right now."'
+						else 
+							if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
+								!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
+								if kid > 0:
+									cla
+									gs 'stat'
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"You''re pregnant again?" Her face turns red and her expression is far angrier than you''ve ever seen her. "After everything, you still didn''t trust me enough to tell me?" she screams at you. "I thought there was something special between us." Tears begin rolling down her cheeks. "Just leave me alone, I don''t even want to see you right now."'
 							
-							elseif knowKatjaPreg = 1:
-								cla
-								gs 'stat'
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
-
-							else
-								cla
-								*nl
-								minut += 5
-								KatjaConflict = 1
-								KatConCheck = daystart
-								'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
-							end							
+								elseif knowKatjaPreg = 1:
+									cla
+									gs 'stat'
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I told you when I got pregnant. I need to think. We''ll talk later."'
+
+								else
+									cla
+									*nl
+									minut += 5
+									KatjaConflict = 1
+									KatConCheck = daystart
+									'"Are you pregnant? Why didn''t you tell me? I thought we were closer than that. I need to think. We''ll talk later."'
+								end							
 						
-						else
-							!!If no events triggers they you go to the part where the player can choose things to do with Katja.
-							gt 'katjaHomeTalk', 'chat' 
+							else
+								!!If no events triggers they you go to the part where the player can choose things to do with Katja.
+								gt 'katjaHomeTalk', 'chat' 
+							end
 						end
 					end
 				end
@@ -253,6 +264,10 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
+	if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+		act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+	end
+
 	act 'Chat with Katja':
 		!!The generic chat option.
 		cla & *clr
@@ -1771,5 +1786,49 @@ if $ARGS[0] = 'anal_sex_with_boy_ask':
 	end					
 end
 
+if $ARGS[0] = 'uni_tell':
+	*clr & cla
+	minut += 15
+	katjaQW['know_going_to_teaching_degree'] = 1
+	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 enrolled in the program at the university for studying to become a teacher. She reply that she also plans to do the same, and that is going to be so much fun studying at the university together. She bombards you with question about the how the enrolment was.'
+	else
+		'You tell Katja that you have also enrolled in the teaching studies program at the university. She reply that it is going to be so much fun studying at the university together. You then spend the next few minutes talking excited about what you know about the program.'
+	end
+	if $loc = 'mey_home':
+		act 'Talk about something else': gt 'KatjaHomeTalk'
+	elseif $loc = 'pav_disco':
+		act 'Ask if she wants to dance': gt 'pav_disco_coolkids', 'katja_dance_ask'
+		act 'Do something else': gt 'pav_disco_classmates', 'classmates'
+	else
+		act 'Talk to someone else': gt 'pav_beach_chat', 'beach_hangout'
+	end
+end
+
+if $ARGS[0] = 'katja_uni_tell':
+	*clr & cla
+	minut += 15
+	 katjaQW['know_katja_uni'] = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	if katjaQW['know_going_to_teaching_degree'] = 0:
+		'Katja excitedly tells you that she has been accepted to the teaching program at the university. She then continue to tell you about how great the program is.' 
+		if university['student'] = 1 and $university['enrolled_in'] = 'teaching_studies':
+			act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+		end	
+	else
+		'Katja excitedly tells you that she has now also been accepted in the teaching studies program at the university, and that it is going to be so much fun studying at the university together. You then spend the next few minutes talking excited about what you know about the program.'
+	end
+	if $loc = 'mey_home':
+		act 'Talk about something else': gt 'KatjaHomeTalk'
+	elseif $loc = 'pav_disco':
+		act 'Talk about something else':  gt 'pav_disco_coolkids', 'katja'
+	else
+		act 'Enjoy the sun': gt 'pav_beach_chat', 'katja'
+	end
+end
+
 --- KatjaHomeTalk ---------------------------------
 

+ 35 - 3
locations/pav_beach_chat.qsrc

@@ -583,8 +583,15 @@ if $ARGS[0] = 'katja':
 	end
 	if grupTipe = 1:
 		if npc_rel['A14'] >= 50:
-			'You spend some time hanging around Kat''s locker, laughing and joking as she tells you some personal stories about Vicky. "She had been drinking all night and had to go, but all the stalls were full, so she drags me out behind the community center to go pee behind a bush." She breaks out into a fit of giggles.'
+			if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+				!!Katja tells you that she has enrolled in the university.
+				gt 'KatjaHomeTalk',  'katja_uni_tell'
+			end
+			'You spend some time lying next to Kat''s, laughing and joking as she tells you some personal stories about Vicky. "She had been drinking all night and had to go, but all the stalls were full, so she drags me out behind the community center to go pee behind a bush." She breaks out into a fit of giggles.'
 			'"She was so drunk, as she was squatting, she stumbled and fell into her own pee!"'
+			if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+				act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+			end
 		elseif npc_rel['A14'] <= 20:
 			'You smile at her as you approach. "Hey Katja, trying a new lipstick out? That color looks pretty on you." '
 			'She smiles sheepishly at your compliment. "Yeah... Just wanted to try something a little different..." she answers quietly. The conversation doesn''t really go anywhere as she keeps her answers short or doesn''t say anything at all. At least she''s willing to actually talk to you.'
@@ -593,8 +600,15 @@ if $ARGS[0] = 'katja':
 		end
 	elseif grupTipe = 2:
 		if npc_rel['A14'] >= 50:
-			'You approach Katja and have a lively conversation where you exchange funny stories about Vanya. "And that''s how my sister fell in love with the biggest clown in school!" she laughs with a snort.'
+			if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+				!!Katja tells you that she has enrolled in the university.
+				gt 'KatjaHomeTalk',  'katja_uni_tell'
+			end
+			'Lying next to Katja you have a lively conversation where you exchange funny stories about Vanya. "And that''s how my sister fell in love with the biggest clown in school!" she laughs with a snort.'
 			'"And I wouldn''t change him for the world!" Vicky adds with a smile.'
+			if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+				act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+			end
 		elseif npc_rel['A14'] <= 20:
 			'Katja looks around nervously when she sees you approaching. "Why do you want to talk to me? I''m not sporty like you or my sister or Albina. Could you go and....speak with someone else please?"'
 		else
@@ -602,7 +616,18 @@ if $ARGS[0] = 'katja':
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A14'] >= 50:
-			'Katja smiles as you approach and you have a lively conversation about your favorite subjects and her plans for going to university after school. "I want to become a teacher. Helping others achieve their potential just sounds like the perfect job!" she gleefully states.'
+			if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+				!!Katja tells you that she has enrolled in the university.
+				gt 'KatjaHomeTalk',  'katja_uni_tell'
+			end
+			if katjaQW['know_katja_uni'] = 0:
+				'Katja smiles as you approach and you have a lively conversation about your favorite subjects and her plans for going to university after school. "I want to become a teacher. Helping others achieve their potential just sounds like the perfect job!" she gleefully states.'
+			else
+				'Lying next to Katja you have a lively conversation looking back at your favorite class in school and about it is going to be for '+iif( katjaQW['know_going_to_teaching_degree'] = 1, 'her', 'you')+' studying at the university.'
+			end
+			if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+				act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+			end
 		elseif npc_rel['A14'] <= 20:
 			'Katja doesn''t look too happy to see you and your conversation doesn''t really go anywhere as she keeps her answers short or doesn''t say anything at all. At least she''s willing to actually talk to you.'
 		else
@@ -610,7 +635,14 @@ if $ARGS[0] = 'katja':
 		end
 	else
 		if npc_rel['A14'] >= 50:
+			if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+				!!Katja tells you that she has enrolled in the university.
+				gt 'KatjaHomeTalk',  'katja_uni_tell'
+			end
 			'Katja takes a surprising interest in what you and your fellow gopniks get up to outside of school and listens carefully when you answer her numerous questions.'
+			if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+				act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+			end
 		elseif npc_rel['A14'] <= 20:
 			'Katja looks around nervously when she sees you approaching. She catches sight of her sister and dashes over to hide behind her, clearly scared of you and wanting to avoid speaking to you.'
 		else

+ 18 - 2
locations/pav_disco_coolkids.qsrc

@@ -1114,14 +1114,22 @@ if $ARGS[0] = 'katja':
 				'Katja sees you approaching and turns to one of the boys in the group. "What are you doing here?" he asks in a slightly threatening tone. It''s clear that you''re not welcome.'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			elseif npc_rel['A25'] >= 50 and fame['pav_slut'] < 200:
+				if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+					!!Katja tells you that she has enrolled in the university.
+					gt 'KatjaHomeTalk',  'katja_uni_tell'
+				else
+					'"Hey <<$pcs_nickname>>, are you having fun?" she asks and you nod in response.'
+				end
 				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
-				'"Hey <<$pcs_nickname>>, are you having fun?" she asks and you nod in response.'
 				'"Have you seen the dress the girl over there is wearing?" she asks while pointing at a tall blonde you haven''t seen before, who is wearing an elegant short dress with a low neckline and open back.'
 				'"I love that dress '+iif(katjaQW['slut']  < 60, 'but I''m not sure I''d be brave enough to wear it here', 'I wish I had a sexy dress like that')+'." she comments and you agree.' 
 				'The conversation continues with Katja pointing out dresses she likes or girls whose make-up she thinks is well done.'
 				if katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
 					act 'Kiss her': gt 'pav_disco_coolkids', 'katja_kiss'
 				end
+				if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+					act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+				end
 				act 'Ask if she wants to dance': gt 'pav_disco_coolkids', 'katja_dance_ask'
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			elseif npc_rel['A25'] <= 20:
@@ -1144,11 +1152,19 @@ if $ARGS[0] = 'katja':
 				end
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			else
+				if katjaQW['know_katja_uni'] = 0 and SchoolAtestat = 1 and (mont > 6 or (mont = 6 and day > 15)):
+					!!Katja tells you that she has enrolled in the university.
+					gt 'KatjaHomeTalk',  'katja_uni_tell'
+				else
+					'"Hey <<$pcs_nickname>>, are you having fun?" she asks and you nod in response.'
+				end
 				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
-				'"Hey <<$pcs_nickname>>, are you having fun?" she asks and you nod in response.'
 				'"Have you seen the dress the girl over there is wearing?" she asks while pointing at a tall blonde you haven''t seen before, who is wearing an elegant short dress with a low neckline and open back.'
 				'"I love that dress '+iif(katjaQW['slut']  < 60, 'but I''m not sure I''d be brave enough to wear it here', 'I wish I had a sexy dress like that')+'." she comments and you agree, but when you turn back to her, she''s already discussing another dress with the girl next to her.'
 				'The conversation continues with Katja pointing out dresses she likes or girls whose make-up she thinks is well done.'
+				if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
+					act 'Tell Katja that you are going to the university': gt 'KatjaHomeTalk', 'uni_tell'
+				end	
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 			end
 		end