[fixed] Christina bugs

locations/gschool_events.qsrc

@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand = 25:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/makeupgirl.jpg"></center>'
 		'As you walk down the hallway, you see Bella sitting on one of the window ledges, ignoring her classmates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.'
-	elseif break_rand = 26:
+	elseif break_rand = 26 and christinaQW['fight'] < 1 and christinaQW['blackmail'] < 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nastymessage.jpg"></center>'
 		if christinaQW['subpath'] > 1:
 			'As you walk down the hallway, you see Christina writing stuff on your locker. You know your place now, so you walk up to her, keeping your eyes on the floor.'

locations/journal_quests.qsrc

@@ -38,25 +38,13 @@ if $ARGS[0] = 'start':
 		'<center><h1>Christina Zvereva</h1></center>'
 		*nl
 		if christinaQW['subpath'] >= 1 or christinaQW['fight'] >= 1 or christinaQW['pre_fight'] >= 1 or christinaQW['blackmail'] >= 1 or christinaQW['pre_bm'] >= 1:
-			if christinaQW['subpath'] >= 3:
-				'Christina owns me now. After gym class, she makes me do things in the showers. I am sure it''s only the beginning, too...'
-			elseif christinaQW['subpath'] = 2:
-				if christinaQW['fight'] = -1:
-					'I challenged Christina ... and lost. I have a feeling that is going to catch up to me somehow...'
-				else
-					'I submitted myself to Christina''s control. I have to wait and see what the future brings...'
-				end
-			else
-				'I heard Christina trains Lina by the lake after school. I should pay them a visit after school sometime.'
-			end
 			if christinaQW['fight'] >= 1 or christinaQW['pre_fight'] >= 1:
 				if christinaQW['fight'] = 1:
 					'I fought Christina and won! She cannot touch me now, and if I demand it, she will give it, or get another beating.'
 				else
 					'I have decided I''m going to beat the crap out of Christina. I should do it afterschool, but in front of the school too, so everybody sees it happen.'
 				end
-			end
-			if christinaQW['blackmail'] >= 1 or christinaQW['pre_bm'] >= 1:
+			elseif christinaQW['blackmail'] >= 1 or christinaQW['pre_bm'] >= 1:
 				if christinaQW['blackmail'] >= 2:
 					'I have managed to successfully blackmail Christina. She can''t touch me now, or I will ruin her.'
 				elseif christinaQW['blackmail'] = 1:
@@ -64,6 +52,18 @@ if $ARGS[0] = 'start':
 				else
 					'I should wait and see what opportunities come up to get some dirt on Christina.'
 				end
+			else
+				if christinaQW['subpath'] >= 3:
+					'Christina owns me now. After gym class, she makes me do things in the showers. I am sure it''s only the beginning, too...'
+				elseif christinaQW['subpath'] = 2:
+					if christinaQW['fight'] = -1:
+						'I challenged Christina ... and lost. I have a feeling that is going to catch up to me somehow...'
+					else
+						'I submitted myself to Christina''s control. I have to wait and see what the future brings...'
+					end
+				else
+					'I heard Christina trains Lina by the lake after school. I should pay them a visit after school sometime.'
+				end
 			end
 		elseif christinaQW['bully'] <= 40 or christinaQW['bully'] >= 60:
 			'I should try and talk to Christina at school.'
@@ -339,8 +339,9 @@ if $ARGS[0] = 'start':
 		elseif katjaQW['QWstage'] > 2:
 			if npc_sex['A14'] = 0:
 				'I''ve kissed Katja, but not gone any further.'+iif(katjaQW['slut'] < 20, ' Katja needs to loosen up a little before she will go any further. Maybe I should try to push her a little when kissing or getting her to be naked at the beach?', ' I think it''s possible that she will go further if the opportunity comes up when hanging out at her home.')
-			end
+			else
 				'While Katja is a shy girl, she is still quite strong willed, and will not do anything sexual if not in the mood. Fortunately for me, it''s pretty easy to determine if she is aroused by how red her face is.'
+			end
 
 			if katjaQW['school_kiss'] = 0 and katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
 				'I should try to kiss Katja at school.'