Merge remote-tracking branch 'Derryth_Love/master'

locations/KatjaHomeTalk.qsrc

@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		end
 	elseif kattalkrand = 4:
-		if katjaQW['knows_masterbation'] > 0:
+		if katjaQW['knows_masturbation'] > 0:
 			'"<<$pcs_nickname>>, tell me how you masturbate."'
 		else
 			'"<<$pcs_nickname>>, do you masturbate?"'
@@ -1099,7 +1099,7 @@ if $ARGS[0] = 'Sextalk':
 				*clr & cla
 				minut += 3
 				katjaQW['horny'] += 5
-				katjaQW['knows_masterbation'] = 1
+				katjaQW['knows_masturbation'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You tell Katja how you masturbate in the bathroom and she blushes and bites her lip.'

locations/gschool_coolkid_chats.qsrc

@@ -601,7 +601,7 @@ if $ARGS[0] = 'katja':
 				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:
+		if katjaQW['QWstage'] > 2 and katjaQW['knows_masturbation'] + 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>'

locations/journal_quests.qsrc

@@ -451,7 +451,7 @@ if $ARGS[0] = 'start':
 				'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:
+			if katjaQW['school_kiss'] = 0 and katjaQW['QWstage'] > 2 and katjaQW['knows_masturbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
 				'I should try to kiss Katja at school.'
 			elseif katjaQW['school_kiss'] = 1:
 				'I should kiss Katja again in school and see what happens.'

locations/katja_procedural.qsrc

@@ -111,7 +111,7 @@ katjaQW['afterschool_hangout_day'] Is set to be equal daystart when you choose t
 katjaQW['no_panties_day'] Is set to daystart if you show Katja that you are not wearing panties.
 katjaQW['no_panties_day_disco'] Is set to daystart if you show Katja that you are not wearing panties at the pav disco. (tangaday)
 
-katjaQW['knows_masterbation'] = 1 You have told Katja how you masturbate (KatjaKnowMastr =1)
+katjaQW['knows_masturbation'] = 1 You have told Katja how you masturbate (KatjaKnowMastr =1)
 katjaQW['knows_self_fisting'] = 1 You have told Katja how you stuck your fist into your pussy
 katjaQW['knows_self_fisting_anal'] = 1 You have told Katja how you stuck your fist into your ass
 katjaQW['knows_BJ'] = 1 You have told Katja that you have given a guy a blow-job (KatjaKnowBJ =1)

locations/pav_disco_coolkids.qsrc

@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'katja':
 				'"Have you seen the dress the girl over there is wearing?" she asks while pointing at a tall blonde you haven''t seen before, who is wearing an elegant short dress with a low neckline and open back.'
 				'"I love that dress '+iif(katjaQW['slut']  < 60, 'but I''m not sure I''d be brave enough to wear it here', 'I wish I had a sexy dress like that')+'." she comments and you agree.' 
 				'The conversation continues with Katja pointing out dresses she likes or girls whose make-up she thinks is well done.'
-				if katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
+				if katjaQW['QWstage'] > 2 and katjaQW['knows_masturbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
 					act 'Kiss her': gt 'pav_disco_coolkids', 'katja_kiss'
 				end
 				if university['student'] = 1 and katjaQW['know_going_to_teaching_degree'] = 0 and $university['enrolled_in'] = 'teaching_studies':
@@ -1140,7 +1140,7 @@ if $ARGS[0] = 'katja':
 					if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) 
 					'Katja notices you approaching and gets up to intercept you before you reach the group. "You shouldn''t be coming over here!" she says in a whispering voice so the others can''t hear her.'
 					'"Your reputation has gotten so bad that we can''t meet in public." she continues. "It''s not because I don''t want be with you, but we need to do it privately. The others will start gossiping if we..." She trails off as you gently stroke her chin and look deep into her eyes.'
-					if katjaQW['knows_masterbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
+					if katjaQW['knows_masturbation'] + katjaQW['knows_BJ'] + katjaQW['knows_sex'] + katjaQW['knows_anal']+ katjaQW['knows_cuni'] >= 2:
 						act 'Kiss her': gt 'pav_disco_coolkids', 'katja_kiss'
 					end
 					act 'Ask if she wants to dance': gt 'pav_disco_coolkids', 'katja_dance_ask'					

locations/saveupdater.qsrc

@@ -2401,6 +2401,9 @@ if temp_current_save_version < 00090200:
 	!!update_clothing
 	!! Do not think we need this anymore. Since pcs_hips should now be basically unchanged.
 	!!gs 'tailor2'
+	
+	!! Typo Correction -- By Derryth_Love
+	if katjaQW['knows_masterbation'] > 0: katjaQW['knows_masturbation'] = katjaQW['knows_masterbation'] & killvar katjaQW['knows_masterbation']
 end