Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/gschool_lessons.qsrc

@@ -368,6 +368,10 @@ if $ARGS[0] = 'grade_check':
 		'You''re only getting top marks in some of your classes, but only a few of your grades are bad and you''re not failing any classes. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
 		'You''re only getting top marks in a few of your classes and are failing others. You should improve your grades if you want to get into university.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13: 
+		'You''re only getting top marks in some of your classes and a lot of bad grades, but you''re not failing any classes. You need to improve your bad grades if you want to get into university.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10: 
+		'You''re getting top marks in a few of your classes, but are failing some of the others. You should improve your grades if you want to get into university.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
 		'You''re getting top marks in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
 	elseif class['school_grades_above_90'] > 0: 

locations/journal.qsrc

@@ -448,6 +448,10 @@ if $ARGS[0] = 'school':
 		'You are only getting top marks in a few of your classes but only a few of your grades are bad and you are not failing any classes. You should probably have no trouble getting into university if you want, but improving the bad grades would not be a bad idea.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
 		'You are only getting top marks in a few of your classes but only a few of your grades are bad and you are failing some classes. If you want to get into university you should probably try to improve the failing and bad grades.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13: 
+		'You''re only getting top marks in some of your classes and a lot of bad grades, but you''re not failing any classes. You need to improve your bad grades if you want to get into university.'
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10: 
+		'You''re getting top marks in a few of your classes, but are failing some of the others. You should improve your grades if you want to get into university.'
 	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
 		'You are getting top marks in a few of your classes but failing a lot of classes. If you want to get into university you need to do something about your failing and bad grades.'
 	elseif class['school_grades_above_90'] > 0: 

locations/journal_quests.qsrc

@@ -393,15 +393,13 @@ if $ARGS[0] = 'start':
 						'Marcus has agreed to be Katja''s first, so I should talk with Katja at her room to set it up.'
 					end
 				end
-				
-			if katjaQW['school_kiss'] > 1 and (katjaQW['ivan_pussy'] + katjaQW['ivan_anal']) = 0:
-					'Ivan seems interested in Katja and I. Maybe I can get them to have a threesome? Kissing Katja at school should get his attention, or maybe we will run into him at the beach.' +iif(katjaQW['slut'] < 60, ' Katja needs to lose some more inhibition before she will agree.', '')+ +iif(IvanShowerQW ! 11, ' I need to have sex with Ivan first (See his quest on how to do this).', '')
-				end
 
-				if katjaQW['birth_control_start_day'] = 0 and katjaQW['QWstage'] >= 5:
+				if katjaQW['birth_control_start_day'] = 0 and katjaQW['QWstage'] >= 6:
 					'I should get Katja on birth control, then I could take her on some wilder sex adventures once she''s ready.'
-				elseif katjaQW['QWstage'] < 6 and katjaQW['anal_ques'] < 3 and katjaQW['slut'] <= 100:
+				elseif katjaQW['QWstage'] < 6 or katjaQW['anal_quest'] < 3 or katjaQW['slut'] <= 100:
 					'I should continue to corrupt Katja. There might be more things I can push her to do.'
+				elseif katjaQW['QWstage'] = 6
+					'Katja wants to talk to me about something at her home. She needs to be somewhat horny to ask me'
 				elseif katjaQW['park_sex'] = 0:
 					'I should take Katja to the park to get her to to hook up with random guys.'
 				elseif katjaQW['park_sex'] = 1:

locations/katja_lake.qsrc

@@ -894,7 +894,7 @@ if $ARGS[0] = 'ivan_interaction':
 		act 'Walk':gt 'katja_lake','walk'
 		act 'Redress and look for something else to do':gs 'clothing', 'wear_last_worn' & gs 'underwear', 'wear' & minut += 10 & gt 'katjaEv','kathan'
 
-		if IvanShowerQW = 11 and fame['pav_slut'] <250 and katjaQW['horny'] >60 and katjaQW['anal_quest'] = 2 and npc_sex['A14'] > 0:
+		if IvanShowerQW = 11 and fame['pav_slut'] <250 and katjaQW['horny'] >60 and katjaQW['anal_quest'] >= 2 and npc_sex['A14'] > 0:
 			act '"Hey Ivan! You know, we are REALLY bored!"':
 				*clr & cla
 				gs 'boyStat', 'A3'