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

locations/gschool_outcast_chats.qsrc

@@ -66,12 +66,14 @@ if $ARGS[0] = 'petia':
 	if fame['pav_slut'] >= 200:
 		if npc_rel['A159'] >= 50:
 			if soniaPS > 0:
-				'"Look everyone, it''s Sonia''s friend! The other school bike!" He walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away. Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and nearly throw up in her mouth in disgust.'
+				'"Look everyone, the other school bike is here! We don''t have to share Sonia anymore!" The nerds awkwardly ignore him as he walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.' 
+				'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and nearly throw up in her mouth in disgust.'
 			else
-				'"Look everyone, it''s the school bike!" He walks up to with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.'
+				'"Look everyone, it''s the school bike!" The nerds awkwardly ignore him as he walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.'
 			end
 		else
-			'He backs away when he sees you approaching. "Get away from me you disgusting slut!" He then stops, turns around and walks back. "Unless you want to give me a blowjob that is?" he asks hopefully, but even you have standards and snort in disgust before walking away. (if Sonia slut - Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and throw up in her mouth in disgust.)'
+			'He backs away when he sees you approaching. "Get away from me you disgusting slut!" He then stops, turns around and walks back. "Unless you want to give me a blowjob that is?" he asks hopefully, but even you have standards and snort in disgust before walking away. '
+			if soniaPS > 0: 'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and nearly throw up in her mouth in disgust.'
 		end
 	elseif grupTipe = 1:
 		grupvalue[1] -= 1
@@ -81,11 +83,12 @@ if $ARGS[0] = 'petia':
 		if npc_rel['A159'] >= 50:
 			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, you''re smoking hot, you know that? I might just let you date me if you ask nicely." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
 			*nl
-			'You snort in laughter. "<i>You<i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or by eaten alive by wild animals than have sex with you!" (if tits >= 5: You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "Stop staring at my tits, loser! My eyes are up here!" you exclaim while covering your breasts with your hand.'
-			'Disgusted, you back away, but feel his creepy gaze on the back of your head as you walk away.'
+			'You snort in laughter. "<i>You<i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or be eaten alive by wild animals than have sex with you!"' 
+			if tits >= 5: 'You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "My eyes are up here, perv! Are you drooling? Eeeww! Go and cream your pants at your own tits, you fat loser!" you exclaim while covering your breasts with your arm. He quickly darts his eyes back up.'
+			'Disgusted, you back away, but sense his creepy gaze on the back of your head as you walk away.'
 		else
-			'Petia looks fearful as you approach. "What do you want?" he snarls.
-			"You should be more polite. This is the only time any girl will ever willingly speak to a loser like you," you reply while trying not to inhale his foul aroma. He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever. "You want to date me. That''s why you''re talking to me."'
+			'Petia looks fearful as you approach. "What do you want?" he snarls.'
+			'"You should be more polite. This is the only time any girl will ever willingly speak to a loser like you," you reply while trying not to inhale his foul aroma. He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever. "You want to date me. That''s why you''re talking to me."'
 			'You snort. "What? No! Eeeww!" You quickly back away and leave him to his delusional fantasy, feeling his creepy gaze on the back of your head as you walk away.'
 		end
 	elseif grupTipe = 2:
@@ -94,21 +97,27 @@ if $ARGS[0] = 'petia':
 		grupvalue[3] -= 1
 		grupvalue[4] -= 1
 		if npc_rel['A159'] >= 50:
-			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. Hey <<$pcs_nickname>>, did I mention that you have an amazing looking body and that you look hot when you work out? I think we should hook up." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
+			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, did I mention that you have an amazing looking body and look so hot when you work out in gym class? You''re too good looking for those jocks and should hook up with me instead." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
 			*nl
-			'You snort in laughter. "<i>You<i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or by eaten alive by wild animals than have sex with you!" (if tits >= 5: You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "Stop staring at my tits, loser! My eyes are up here!" you exclaim while covering your breasts with your hand.'
-			'Disgusted, you back away, but feel his creepy gaze on the back of your head as you walk away.'
+			'You snort in laughter. "<i>You<i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or be eaten alive by wild animals than have sex with you!"' 
+			if tits >= 5: 'You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "Do you drool at the sight of my tits in gym class as well, you dirty perv?" you ask sternly while covering your breasts with your arm. He quickly darts his eyes back up. '
+			'Disgusted, you back away, but sense him staring at your ass as you walk away.'
 		else
-			'Petia looks fearful as you approach. "What do you want?"
+			'Petia looks fearful as you approach. "What do you want?" 
 			"You should be more polite. This is the only time any girl will ever willingly speak to a loser like you," you reply while trying not to inhale his foul aroma. He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever. "You want to date me. That''s why you''re talking to me."'
-			'You snort. "What? No! Eeeww!" You quickly back away and leave him to his delusional fantasy, feeling his creepy gaze on the back of your head as you walk away.'
+			'You snort. "What? No! Eeeww!" You quickly back away and leave him to his delusional fantasy, but sense him staring at your ass as you walk away.'
 		end
 	elseif grupTipe = 3:
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
 		grupvalue[3] -= 1
 		grupvalue[4] -= 1
-		if npc_rel['A159'] >= 50:
+		if hotcat >= 6:
+			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <$pcs_nickname>>, you''re pretty sexy for a nerd. How about we study together sometime?" He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
+			if tits >= 5: 'You notice him practically drooling while staring at your breasts and quickly cover them with your arm, causing him to quickly dart his eyes back up.'
+			'Before things can go any further, your fellow nerds come to your rescue and motion for you to join them. You quickly dash over to them and escape his foul aroma, but sense his creepy gaze following you across the room.'
+			end 
+		elseif npc_rel['A159'] >= 50:
 			'You notice Petia desperately walking up and down the classroom trying to mooch stuff from the others. When he sees you, he breaks out into a smile and quickly starts walking towards you. "The others are being mean! They won''t help me out and I''m getting really hungry!"'
 			act 'Give him money (50 <b>₽</b>)':
 				*clr & cla
@@ -161,10 +170,12 @@ if $ARGS[0] = 'petia':
 		if npc_rel['A159'] >= 50:
 			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. Hey <<$pcs_nickname>>, did I tell you that I like bad girls? I think we should date." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
 			'You shove him away from you. "What the fuck? Why would I date a fat, smelly loser like you? Get the fuck away from me before I knock those rotten teeth of yours out!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.' 
+            if tits >= 5: '"And I seen you staring at my tits as well, perv! Do it again and I''ll kick your balls back up inside you!" you add.'		
 		else
 			'Petia looks a little fearful, yet somehow confident at the time. "What do you want, loser?" you snarl while trying not to inhale his foul aroma.'
 			'He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever. "I think you''re just acting tough because you''re scared of the truth. You want to date me. Why else would you be talking to me?"'
 			'"Date <i>you</i>?!" you exclaim while balling your fist up. "I would punch your teeth out right now if I wasn''t worried about catching some filthy disease off of you. It''s called ''soap'', you smelly cunt!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.'
+			if tits >= 5: '"And I seen you staring at my tits as well, perv! Do it again and I''ll kick your balls back up inside you!" you add.'
 		end
 	else
 		if npc_rel['A159'] >= 50:
@@ -224,7 +235,7 @@ if $ARGS[0] = 'sonia':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	if fame['pav_slut'] >= 250:
 		if npc_rel['A25'] >= 50:
-			'You see Sonia sitting by herself as usual and approach her with a friendly smile. She looks up and gives you a friendly smile in return. "What''s up slut?" You laugh and sit next to her, telling her about your day. You banter back and forth about whose breath smells like cum and discuss each of your latest sexcapades.'
+			'You see Sonia sitting by herself as usual and approach her with a friendly smile. She looks up and gives you a friendly smile in return. "What''s up, slut?" You laugh and sit next to her, telling her about your day. You banter back and forth about whose breath smells like cum and discuss each of your latest sexcapades.'
 		elseif npc_rel['A25'] <= 20:
 			'You see Sonia sitting by herself as usual and approach her with a friendly smile. She looks up and frowns. "What do you want <<$pcs_nickname>>?"' 
 			'You sit next to her. "I just wanted to talk." She is reluctant at first, but slowly starts to get engaged in the conversation. The two of you talk about fashion, makeup and eventually sex. You discuss the different people you have had sex with and who is better.'