Merge remote-tracking branch 'Anya/master'

locations/ender.qsrc

@@ -617,8 +617,8 @@ if $ARGS[0] = 'win':
 		'You''ve managed to batter one of your attacker''s face while you broke the other''s nose. As he spits, you can see that his spit is mixed with blood as he can barely hold his hand up to surrender. You quickly run over to them and empty the cash from their pockets and mock them. They quickly stumble to their feet and run away in fear.'
 
 		act 'Go home':	gt 'din_npc', 'go_home'
-
 	elseif fightEnding = 12:
+		if LariskaQW['story'] = 3: LariskaQW['story'] = 4
 		christinaQW['fight'] = 1
 		christinaQW['pre_fight'] = 0
 		Win += 1
@@ -627,7 +627,7 @@ if $ARGS[0] = 'win':
 		'Christina falls to the ground. You grab her by the hair and yank her head back so she can hear you better. "Ok, bitch. Here is how it''s going to be from now on. You look at me wrong, and I will break you in half and toss you through the nearest window. If I ask for something, you say yes without hesitation." You give her head a good shake. "Do we understand each other? I can''t hear you agreeing."'
 		'"Yes! Leave you alone! I won''t bother you again! Anything you want from me, it''s a yes!"'
 		'Satisfied with her answer, you let her go and straighten up, looking around. The kids watching look at you a bit warily, seeing you in a new light. Christina had a reputation of being one of the toughest fighters in school, and you just thrashed her, right in front of everybody.'
-		
+
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:
 		fightEnding = 0

locations/gschool_jock_chats.qsrc

@@ -889,11 +889,19 @@ if $ARGS[0] = 'lariska':
 			end
 		elseif LariskaQW['story'] = 3:
 			gs 'npc_relationship', 'modify', 'A13', 'like'
-			'"Hey, Lariska! How is your day going?"'
-			'"I''m sorry, <<$pcs_nickname>>, but I told you, Christina doesn''t really want me hanging out with you after school."'
-			'"I know Lariska, I''m working on it. In the meantime, I was just saying hi."'
-			'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you will manage to convince her." She gives you a sad smile.'
-			'"Hang in there, sweetie. I''ll convince her, I promise."'
+			if christinaQW['blackmail'] >= 2 or christinaQW['subpath'] >= 2 or christinaQW['fight'] = 1:
+				LariskaQW['story'] = 5
+				gs 'npc_relationship', 'modify', 'A13', 'like'
+				'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
+				'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'
+				'She blushes a bit and says "Good, I''m looking forward to it!"'
+			else
+				'"Hey, Lariska! How is your day going?"'
+				'"I''m sorry, <<$pcs_nickname>>, but I told you, Christina doesn''t really want me hanging out with you after school."'
+				'"I know Lariska, I''m working on it. In the meantime, I was just saying hi."'
+				'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you will manage to convince her." She gives you a sad smile.'
+				'"Hang in there, sweetie. I''ll convince her, I promise."'
+			end
 		elseif LariskaQW['story'] = 4:
 			LariskaQW['story'] = 5
 			gs 'npc_relationship', 'modify', 'A13', 'like'