Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/gschool_coolkid_chats.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'dimka':
 	gs 'npc_relationship', 'modify', 'A1', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+
 	if dimka_debt > 0:
 		cla
 		'You walk up to Dimka and the first thing he does is pull you aside. "Do you have my money?"'
@@ -36,79 +36,88 @@ if $ARGS[0] = 'dimka':
 			end
 			act 'Go with Dimka': gt 'gschool_coolkid_chats', 'dimka_sex'
 		end
-	elseif DimaRudeQW > 0 and DimaRudeBlock = 0:
-		'Dimka looks into your eyes with a disinterested glare. "Whatever. After school, we''re going to my place. I''ll wait for you by the entrance."'
-	elseif (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
-		'As you walk up he glares at you. "What the fuck do you want slut?"'
-		'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something."'
-		'He stares at you blankly before shrugging. "Whatever." The two of you make small talk, but you get the feeling he is planning something.'
-	elseif fame['pav_slut'] >= 200:
-		gs 'npc_relationship', 'modify', 'A1', 'dislike'
-		if npc_rel['A1'] >= 70:
-			'Dimka sees you approaching and gives you a blank stare, his gaze cold and unblinking. When you get close, he steps closer and hisses to you so the others can''t overhear him. "Don''t walk up to me at school like this! I have a reputation to protect." He then pushes you away and speaks loudly enough for everyone to hear him. "Get lost slut! No one wants you here." He continues to stare you down until you finally leave.'
-		else
-			'Dimka sees you approaching and gives you a blank stare, his gaze cold and unblinking. "Do you really think I would talk to a whore like you?" he dryly states. He continues to stare you down until you finally leave.'
-		end
-	elseif grupTipe = 1:
-		if npc_rel['A1'] >= 50:
-			'"Just the person I was hoping to see!" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
-			if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
-		elseif npc_rel['A1'] <= 20:
-			'"You seem to have the wrong idea about me <<$pcs_nickname>>." Dimka holds out his hand to keep you from getting any closer. "Just because we run in the same social circle doesn''t mean we''re friends."'
-			'You can''t help but scoff and roll your eyes. "Who said I want to be friends? You just looked lonely standing over here by yourself. I was just trying to be nice." You trade a few more barbs back and forth.'
-		else
-			'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
-		end
-	elseif grupTipe = 2:
-		if npc_rel['A1'] >= 50:
-			'"Have I shown you my photos from my last trip?" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
-			if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
-		elseif npc_rel['A1'] <= 20:
-			'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
-			'"I just wanted to say hi is all," you reply.'
-			'He looks around like this is a common burden. "Of course you did, everyone does." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
-		else
-			'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
-		end
-	elseif grupTipe = 3:
-		if npc_rel['A1'] >= 60:
-			'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
-			if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
-		elseif npc_rel['A1'] <= 20:
-			'Dimka looks down at you with a condescending smile. "You get lost loser? Shouldn''t you be off pretending to be an elf or something?" he asks with a charming smile on his face.'
-			'"I just wanted to say hi is all," you reply.'
-			'He looks around like this is a common burden. "Of course you did, everyone does. Now that you have, why don''t you go back to your own kind?" You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
-		else
-			'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
-			'"I just wanted to say hi is all," you reply.'
-			'He looks around like this is a common burden. "Of course you did, everyone does." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
-		end
-	elseif grupTipe = 4:
-		if npc_rel['A1'] >= 60:
-			'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
-			if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
-		elseif npc_rel['A1'] <= 20:
-			'Dimka looks down at you with a condescending smile. "What do you want? We don''t have any drugs and none of us want whatever it is you''re selling," he remarks, maintaining his "friendly" appearance in front of everyone.'
-			'"I just wanted to say hi is all," you reply.'
-			'He looks around like this is a common burden. "Of course you did, everyone does. Now go away before you ruin everyone''s day with your dreadful attempt at fashion." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
-		else
-			'Dimka looks down at you with a condescending smile. "What do you want? Maybe looking for some fashion advice?" he asks, maintaining his "friendly" appearance in front of everyone.'
-			'"I just wanted to say hi is all," you reply.'
-			'He looks around like this is a common burden. "Of course you did, everyone does. Now that I''ve made your day you can go do... whatever it is you people do." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
-		end
 	else
-		gs 'npc_relationship', 'modify', 'A1', 'dislike'
-		if npc_rel['A1'] >= 70:
-			'As you walk up, he gives a slightly disgusted look like he just smelt something bad. "Come to see how your betters look?"'
-			'You sigh. "I just wanted to say hi."'
-			'He laughs and looks at some of the others, who laugh in turn. "Of course you would, how could we expect someone like you to know the rules of polite society? I mean really. Very well. You''ve had your moment, now please go." He and the others proceed to ignore you.'
+		if DimaRudeQW > 0 and DimaRudeBlock = 0:
+			'Dimka looks into your eyes with a disinterested glare. "Whatever. After school, we''re going to my place. I''ll wait for you by the entrance."'
 		else
-			'He glares at you as you approach. "What the fuck do you want, loser?"'
-			'You sigh. "I just wanted to say hi."'
-			'He shakes his head. "Let me make this clear. No one wants you around, so why don''t you do something useful for a change and go home and hang yourself or something and make the world a better place?" He starts laughing, along with several of the others.'
+			if (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
+				'As you walk up he glares at you. "What the fuck do you want slut?"'
+				'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something."'
+				'He stares at you blankly before shrugging. "Whatever." The two of you make small talk, but you get the feeling he is planning something.'
+			else
+				if fame['pav_slut'] >= 200:
+					gs 'npc_relationship', 'modify', 'A1', 'dislike'
+					if npc_rel['A1'] >= 70:
+						'Dimka sees you approaching and gives you a blank stare, his gaze cold and unblinking. When you get close, he steps closer and hisses to you so the others can''t overhear him. "Don''t walk up to me at school like this! I have a reputation to protect." He then pushes you away and speaks loudly enough for everyone to hear him. "Get lost slut! No one wants you here." He continues to stare you down until you finally leave.'
+					else
+						'Dimka sees you approaching and gives you a blank stare, his gaze cold and unblinking. "Do you really think I would talk to a whore like you?" he dryly states. He continues to stare you down until you finally leave.'
+					end
+				else
+					if grupTipe = 1:
+						if npc_rel['A1'] >= 50:
+							'"Just the person I was hoping to see!" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
+							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
+						elseif npc_rel['A1'] <= 20:
+							'"You seem to have the wrong idea about me <<$pcs_nickname>>." Dimka holds out his hand to keep you from getting any closer. "Just because we run in the same social circle doesn''t mean we''re friends."'
+							'You can''t help but scoff and roll your eyes. "Who said I want to be friends? You just looked lonely standing over here by yourself. I was just trying to be nice." You trade a few more barbs back and forth.'
+						else
+							'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
+						end
+					elseif grupTipe = 2:
+						if npc_rel['A1'] >= 50:
+							'"Have I shown you my photos from my last trip?" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
+							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
+						elseif npc_rel['A1'] <= 20:
+							'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
+							'"I just wanted to say hi is all," you reply.'
+							'He looks around like this is a common burden. "Of course you did, everyone does." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+						else
+							'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
+						end
+					elseif grupTipe = 3:
+						if npc_rel['A1'] >= 60:
+							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
+							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
+						elseif npc_rel['A1'] <= 20:
+							'Dimka looks down at you with a condescending smile. "You get lost loser? Shouldn''t you be off pretending to be an elf or something?" he asks with a charming smile on his face.'
+							'"I just wanted to say hi is all," you reply.'
+							'He looks around like this is a common burden. "Of course you did, everyone does. Now that you have, why don''t you go back to your own kind?" You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+						else
+							'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
+							'"I just wanted to say hi is all," you reply.'
+							'He looks around like this is a common burden. "Of course you did, everyone does." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+						end
+					elseif grupTipe = 4:
+						if npc_rel['A1'] >= 60:
+							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
+							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
+						elseif npc_rel['A1'] <= 20:
+							'Dimka looks down at you with a condescending smile. "What do you want? We don''t have any drugs and none of us want whatever it is you''re selling," he remarks, maintaining his "friendly" appearance in front of everyone.'
+							'"I just wanted to say hi is all," you reply.'
+							'He looks around like this is a common burden. "Of course you did, everyone does. Now go away before you ruin everyone''s day with your dreadful attempt at fashion." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+						else
+							'Dimka looks down at you with a condescending smile. "What do you want? Maybe looking for some fashion advice?" he asks, maintaining his "friendly" appearance in front of everyone.'
+							'"I just wanted to say hi is all," you reply.'
+							'He looks around like this is a common burden. "Of course you did, everyone does. Now that I''ve made your day you can go do... whatever it is you people do." You try talking to him, but he acts like he is barely tolerating you, like a Tsar might a peasant in his court.'
+						end
+					else
+						gs 'npc_relationship', 'modify', 'A1', 'dislike'
+						if npc_rel['A1'] >= 70:
+							'As you walk up, he gives a slightly disgusted look like he just smelt something bad. "Come to see how your betters look?"'
+							'You sigh. "I just wanted to say hi."'
+							'He laughs and looks at some of the others, who laugh in turn. "Of course you would, how could we expect someone like you to know the rules of polite society? I mean really. Very well. You''ve had your moment, now please go." He and the others proceed to ignore you.'
+						else
+							'He glares at you as you approach. "What the fuck do you want, loser?"'
+							'You sigh. "I just wanted to say hi."'
+							'He shakes his head. "Let me make this clear. No one wants you around, so why don''t you do something useful for a change and go home and hang yourself or something and make the world a better place?" He starts laughing, along with several of the others.'
+						end
+					end
+				end
+			end
 		end
+
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
 if $ARGS[0] = 'dim_drugs':
@@ -470,151 +479,170 @@ if $ARGS[0] = 'katja':
 	menu_off = 1
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-	if npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and katjaQW['no_panties_day'] ! daystart:
-		act 'Show her you are not wearing panties.': gt 'Katja_tanga', 'school'
-	end
-	if katjaQW['QWstage'] > 2:
-		if katjaQW['Horny'] < 20:
-			'Katja looks calm and stoic.'
-		elseif katjaQW['Horny'] < 40:
-			'You see a naughty twinkle in Katja''s eyes.'
-		elseif katjaQW['Horny'] < 60:
-			'Katja has a faint blush on her cheeks as she looks at you mischievously.'
-		elseif katjaQW['Horny'] < 80:
-			'Katja is blushing fairly obviously and looks at you longingly.'
-		else
-			'Katja''s face is flushed bright red and her chest is heaving from her heavy breathing. She''s idly rubbing her thighs against one another while you talk.'
-		end
-	end
-	if katjaQW['drunk_help'] = 1:
-		act 'Thank her for taking you home':
-			*clr & cla
-			gs 'npc_relationship', 'modify', 'A14', 'like'
-			katjaQW['drunk_help'] = 0
-			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'You approach Katja and thank her for taking you home from the disco when you were drunk and she gives you a knowing smile. "Don''t mention it <<$pcs_nickname>>! You really shouldn''t get that drunk again though. It could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together?"'
-			'"Sure, why not?" you reply.'
-			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-		end
-	end
-	if katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
-		act 'Kiss Katja':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
-			'You lean in to kiss Katja.'
-			if katjaQW['horny'] < 30:
-				cla & *nl
-				'She pulls away from you as you try and kiss her, looking around to see if anyone seen you. "Not here and not now."'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-			else
-				*clr & cla
-				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You slowly lean in towards Katja to kiss her. Unable to resist, Katja closes her eyes, slowly opens her mouth and leans in to meet your kiss.'
-				gs 'katjaEvDin', 'kiss_events'
-			end
-		end
-	end
+
 	if rand(1,2) = 1 and katjaQW['school_sex'] = 1 and katjaQW['horny'] >= 40:
-		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
 		gs 'katjaEvDin', 'kiss_events'
-	elseif katjaQW['QWstage'] > 1 and pcs_makeup <= 1:
-		'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
-		act 'Let her put makeup on you':
-			*clr & cla
-			pcs_hairbsh = 1
-			gs 'stat'
-			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'Katja happily grins as she quickly straightens your hair. "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
-			act 'Light touch-up':
-				cla
-				pcs_makeup = 2
-				'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
-				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-				act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
-			end
-			act 'Normal make-up':
-				cla
-				pcs_makeup = 3
-				'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
-				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-				act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+
+		if npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and katjaQW['no_panties_day'] ! daystart:
+			act 'Show her you are not wearing panties.': gt 'Katja_tanga', 'school'
+		end
+
+		if katjaQW['QWstage'] > 2:
+			if katjaQW['Horny'] < 20:
+				'Katja looks calm and stoic.'
+			elseif katjaQW['Horny'] < 40:
+				'You see a naughty twinkle in Katja''s eyes.'
+			elseif katjaQW['Horny'] < 60:
+				'Katja has a faint blush on her cheeks as she looks at you mischievously.'
+			elseif katjaQW['Horny'] < 80:
+				'Katja is blushing fairly obviously and looks at you longingly.'
+			else
+				'Katja''s face is flushed bright red and her chest is heaving from her heavy breathing. She''s idly rubbing her thighs against one another while you talk.'
 			end
-			act 'Heavy make-up':
-				cla
-				pcs_makeup = 4
-				'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
-				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+		end
+
+		if katjaQW['drunk_help'] = 1:
+
+			act 'Thank her for taking you home':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A14', 'like'
+				katjaQW['drunk_help'] = 0
+				gs 'stat'
+				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You approach Katja and thank her for taking you home from the disco when you were drunk and she gives you a knowing smile. "Don''t mention it <<$pcs_nickname>>! You really shouldn''t get that drunk again though. It could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together?"'
+				'"Sure, why not?" you reply.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
-				act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
 			end
 		end
-	elseif fame['pav_slut'] >= 200:
-		if npc_rel['A14'] >= 50:
-			'"Hey Katja, I was wondering if you had any recommendations for lipstick that won''t smear? Things can get kind of messy when I''m... you know." You press your tongue against the inside of your cheek to imitate sucking cock.'
-			'She looks at you in confusion for a few seconds before she gasps softly. "That... that''s gross!" she huffs. "How can you even ask me something like that?!"'
-		elseif npc_rel['A14'] <= 20:
-			'Katja looks around nervously when she sees you approaching. She catches sight of her sister and dashes over to her, clearly wanting to avoid speaking to you.'
-		else
-			'Katja doesn''t look too happy to see you and spends most of your awkwardly one sided conversation fumbling as she looks for a way out. As soon as the bell rings, she immediately dashes off.'
-		end
-	elseif 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.'
-			'"She was so drunk, as she was squatting, she stumbled and fell into her own pee!"'
-		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.'
-		else
-			'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
-		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.'
-                        '"And I wouldn''t change him for the world!" Vicky adds with a smile.'
-		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
-			'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
-		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.'
-		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
-			'Altough Katja is happy to see you, she doesn''t do much talking. You get the feeling that she''d open up more if you were closer, but for now you''ll have to settle with this.'
-		end
-	elseif grupTipe = 4:
-		if npc_rel['A14'] >= 50:
-			'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.'
-		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
-			'With Katja being a quiet girl, she doesn''t do much talking and often avoids eye contact with you. You get the feeling she''d open up more if you were closer, but for now you''ll have to settle with this.'
+
+		if katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
+
+			act 'Kiss Katja':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
+				'You lean in to kiss Katja.'
+				if katjaQW['horny'] < 30:
+					cla & *nl
+					'She pulls away from you as you try and kiss her, looking around to see if anyone seen you. "Not here and not now."'
+					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+				else
+					*clr & cla
+					'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'You slowly lean in towards Katja to kiss her. Unable to resist, Katja closes her eyes, slowly opens her mouth and leans in to meet your kiss.'
+					gs 'katjaEvDin', 'kiss_events'
+				end
+			end
 		end
-	else
-		if npc_rel['A14'] >= 50:
-			'Despite the judgmental stares and insults the other cool kids and jocks throw at you, Katja makes the time to briefly speak with you before Vicky pulls her away to "save" her from the "social embarrassment" of speaking with you.'
-		elseif npc_rel['A14'] <= 20:
-			'Katja looks around nervously when she sees you approaching. She catches sight of her sister and dashes over to her, clearly wanting to avoid speaking to you.'
+
+		if katjaQW['QWstage'] > 1 and pcs_makeup <= 1:
+			'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
+
+			act 'Let her put makeup on you':
+				*clr & cla
+				pcs_hairbsh = 1
+				gs 'stat'
+				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'Katja happily grins as she quickly straightens your hair. "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
+
+				act 'Light touch-up':
+					cla
+					pcs_makeup = 2
+					'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
+					if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+
+					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+					act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
+				end
+
+				act 'Normal make-up':
+					cla
+					pcs_makeup = 3
+					'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
+					if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+
+					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+					act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
+				end
+
+				act 'Heavy make-up':
+					cla
+					pcs_makeup = 4
+					'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
+					if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+
+					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+					act 'Keep talking to her': gt 'gschool_coolkid_chats', 'katja'
+				end
+			end
 		else
-			'With Katja being a quiet girl, she doesn''t do much talking, the judgmental stares of the other cool kids only making things worse for her. You get the feeling she''d be more comfortable speaking with you if you were closer to her or more popular with your peers.'
+			if fame['pav_slut'] >= 200:
+				if npc_rel['A14'] >= 50:
+					'"Hey Katja, I was wondering if you had any recommendations for lipstick that won''t smear? Things can get kind of messy when I''m... you know." You press your tongue against the inside of your cheek to imitate sucking cock.'
+					'She looks at you in confusion for a few seconds before she gasps softly. "That... that''s gross!" she huffs. "How can you even ask me something like that?!"'
+				elseif npc_rel['A14'] <= 20:
+					'Katja looks around nervously when she sees you approaching. She catches sight of her sister and dashes over to her, clearly wanting to avoid speaking to you.'
+				else
+					'Katja doesn''t look too happy to see you and spends most of your awkwardly one sided conversation fumbling as she looks for a way out. As soon as the bell rings, she immediately dashes off.'
+				end
+			else
+				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.'
+						'"She was so drunk, as she was squatting, she stumbled and fell into her own pee!"'
+					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.'
+					else
+						'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
+					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.'
+									'"And I wouldn''t change him for the world!" Vicky adds with a smile.'
+					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
+						'With Katja being a quiet girl, she doesn''t do much talking, but she seems to enjoy some lighthearted banter with you, so long as you''re doing most of the talking. You get the feeling that if you were closer, she''d open up more, but for now you''ll have to settle with this.'
+					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.'
+					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
+						'Altough Katja is happy to see you, she doesn''t do much talking. You get the feeling that she''d open up more if you were closer, but for now you''ll have to settle with this.'
+					end
+				elseif grupTipe = 4:
+					if npc_rel['A14'] >= 50:
+						'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.'
+					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
+						'With Katja being a quiet girl, she doesn''t do much talking and often avoids eye contact with you. You get the feeling she''d open up more if you were closer, but for now you''ll have to settle with this.'
+					end
+				else
+					if npc_rel['A14'] >= 50:
+						'Despite the judgmental stares and insults the other cool kids and jocks throw at you, Katja makes the time to briefly speak with you before Vicky pulls her away to "save" her from the "social embarrassment" of speaking with you.'
+					elseif npc_rel['A14'] <= 20:
+						'Katja looks around nervously when she sees you approaching. She catches sight of her sister and dashes over to her, clearly wanting to avoid speaking to you.'
+					else
+						'With Katja being a quiet girl, she doesn''t do much talking, the judgmental stares of the other cool kids only making things worse for her. You get the feeling she''d be more comfortable speaking with you if you were closer to her or more popular with your peers.'
+					end
+				end
+			end
 		end
+
+		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
-	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
 
-
 if $ARGS[0] = 'Katjaproblems':
 	cls
 	menu_off = 1
@@ -936,7 +964,7 @@ if $ARGS[0] = 'Marcus_Katja_talk':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	'"So you know how we sometimes have fun together?" you ask him.'
 	'"Yeah?" he answers and you smile. "Well, I have this friend who have never been with a boy before but would like to try. So I was wondering if you were up for helping me give her an amazing first time? She''s '+iif( hotcat < hotcat_rating['A14'], 'even hotter that I am', 'totally hot')+' so you won''t regret it."'
-	'"Are you asking me if I want to have a threesome with two beautiful girls, with one of them even being a virgin?" he asks with a surprised look on his face. "Of course I''m up for this!" he exclaims as his face turns into a huge grin.' 
+	'"Are you asking me if I want to have a threesome with two beautiful girls, with one of them even being a virgin?" he asks with a surprised look on his face. "Of course I''m up for this!" he exclaims as his face turns into a huge grin.'
 	'"Great," you answer. "I''ll call you with her address when we are ready. But you have to be discrete, we don''t want any rumors spread around!" you tell him and he smiles. "Of course, I''m a gentleman and gentlemen never kiss and tell. I look forward to your call."'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end