Browse Source

[changed/fixed] Changed the Katja quest variables to new array, and cleaned her code. Did substatial revision of some of the logic of her quest lines. Also did some small changes to meeting boys in the park. (Cikl also have something related to exams that was not pushed with the other exams stuff.)

bgkjdgbizgblzdgbr 2 years ago
parent
commit
2609c42b01

+ 264 - 119
locations/KatjaHomeTalk.qsrc

@@ -1,7 +1,56 @@
 # KatjaHomeTalk
-!2021/05/02
+!2021/30/11
+
+!!This files governs Katjas interactions in ther room. The following variables are part of her storry line (the name in the parenthsis is the old name of that variable):
+!! katjaQW['QWstage'] = 1 You have agreed to hang out with Katja afer school. (meynoldQW = 1)
+!! katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2) 
+!! katjaQW['QWstage'] = 3 You have kissed Katja and she might be interested in more. (katjaFirstKiss = 1 and KatjaOTN)
+!! npc_sex['A14'] = 1 You have had at least one sexual experince with Katja.
+
+!! katjaQW['pantiesQWstage'] The stages of the side quest of getting Katja to go comando to school. 1 to 3 are just temprary counts,
+!!									4 means you have gotten Katja to take of her panties when you ask her, and 5 means that she wont wear panties to school anymore.
+!!									So if you waht to chack if Katja are not wearing pantios at school use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
+									
+!! katjaQW['slut'] a number that increasese as Katja becomes more and more sexualy liberated, and alows her to be villing to do more sexual stuff. (katjaSlut)
+!! katjaQW['horny'] a messure of Katja''s arousal. Grows until she have an orgasmn and will determine how willing she is at the moment to have sex.
+!!	katjaQW['park_sex'] 	a messure of what experience Katja have had with random guys in the park. 0 means she have not have had sex whit anybody in the park, 
+!!								1 means that she have had sex with one guy at a time (either alone, in a threesome with the player character or in while the the player have sex with another guy next to them)
+!!								2 means she have had a threesome whit 2 guys you met in the park, and 3 means she has paticipated in an orgy with guys from the park. (katjaSex)
+
+!! katjaQW['masturbates'] = 1 Katja have started masturbating at night if she get to horny. (KatjaMastr)
+!! The following 3 varibles functions as pcs_throat, pcs_vag and pcs_ass does for the player character. So whenever Katja have sex with a guy or a dildo is used on her you should add code to change them as is done for the player character in arousal.
+!! npc_throat['A14'] The capacity for Katja to take a dick (or dildo) down her throat. (KatjaThroat)
+!! npc_vag['A14'] The capacity for Katja to take a dick (or dildo) in the vagina.
+!! npc_ass['A14'] The capacity for Katja to take a dick (or dildo) in her ass. (KatjaAnus)
+
+!! katjaQW['ivan_anal'] = 1 Katja have take Ivan''s cock in her ass.
+
+!! KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all palces). (KatjaOrgasm)
+!! katjaQW['afterschool_hangout_day'] Is set to be equal daystart when you choose to hang out with Katja after school. (katjaMeynoldday)
+!! katjaQW['no_panties_day'] Is set to daystart if you show Katja that you are not wearing panties. (tangaday)
+
+
+!! katjaQW['knows_masterbation'] = 1 You have told Katja how you masturbate (KatjaKnowMastr =1)
+!! katjaQW['knows_self_fisting'] = 1 You have told Katja how you stuck you fist into your anus (SelfFistingKnow =1)
+!! katjaQW['knows_BJ'] = 1 You have told Katja that you have given a guy a blow-job (KatjaKnowBJ =1)
+!! katjaQW['knows_sex'] = 1 You have told Katja that you have had virginal sex with a guy (KatjaKnowSex =1)
+!! katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
+!! katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
+!! katjaQW['know_Pirced_tongue'] = 1 katja have noticed your tongue piercing (KatjaKnowPirsA =1)
+
+!! katja['school_sex'] = 1 Katja have taken you to a storage room at school to have sex. (katschoolsex)
+!! katjaQW['disco_Foto'] =1 somebody have takien a picture of Katja''s exposed breast at the disco. Right now to only use of this variable is so that another foto wont be taken. (katja_disco_Foto)
+
+!! katjaQW['drunk_help'] is set to 1 when Katja walks you home from the disco because you are to drunk. Will be reset to 0 after you talk to her about it at school. (meynoldQW = 3)
+!! katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not vearing panties. Will be reset to 0 at night. (katja_disco_end)
+!! KatjaQW['sex_in_the_park_comment'] temposry varibale which is set during sex with guys in the park to make sure she give the right comment before she says goodbuy. Will be rest to 0 when going home after sex. (KatjaOhrenet)
 
 if $ARGS[0] = '':
+	$loc = 'mey_home'
+	$loc_arg = '5'
+	$menu_loc = 'mey_home'
+	$menu_arg = '5'
+	$locclass = 'livingr'
 	$location_type = 'indoors'
 	CLOSE ALL
 	menu_off = 1
@@ -17,7 +66,7 @@ if $ARGS[0] = '':
 			minut += 15
 			gs 'stat'
 
-			if KatjaHorny >= 50:
+			if katjaQW['horny'] >= 50 and katjaQW['QWstage'] > 2:
 				'Katja takes you into the bathroom. Blushing, she says, "I think I''ll join you."'
 
 				act 'Have the shower alone':
@@ -54,8 +103,7 @@ if $ARGS[0] = '':
 						if frost > 0:frost = 0
 
 						pcs_horny += 10
-						KatjaHorny += 10
-						KatjaLust += 1
+						katjaQW['horny'] += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/shower.jpg"></center>'
 						'You and Katja undress and climb into the shower together.'
@@ -69,7 +117,7 @@ if $ARGS[0] = '':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/shower2.jpg"></center>'
 								'Katja gently rubs shampoo into your hair then rinses it out with warm shower jets.'
 
-								if KatjaLust >= 10 and KatjaHorny >= 90:
+								if katjaQW['horny'] >= 80 and npc_sex['A14'] > 0:
 									'Katja washes your pussy and breasts with soap, gently stroking her palms against you. Her cheeks are flushed and her eyes glistening.'
 
 									act 'Continue': gt 'KatjaHomeTalk', 'shower_kiss_home'
@@ -87,13 +135,12 @@ if $ARGS[0] = '':
 								cla & *clr
 								minut += 5
 								pcs_pubes = 0
-								KatjaHorny += 10
-								KatjaLust += 1
+								katjaQW['horny'] += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/lobok.jpg"></center>'
 								'Katja sat in the bath and you lathers your crotch (and most of your stomach and chest) with shaving gel. She takes a razor and begins to gently shave the hair between your legs.'
 
-								if KatjaLust >= 10 and KatjaHorny >= 90:
+								if katjaQW['horny'] >= 80 and npc_sex['A14'] > 0:
 									'Katja washes your pussy and breasts with soap, gently stroking her palms against you. Her cheeks are flushed and her eyes glistening.'
 
 									act 'Continue': gt 'KatjaHomeTalk', 'shower_kiss_home'
@@ -107,7 +154,7 @@ if $ARGS[0] = '':
 						end
 					end
 				end
-			elseif KatjaHorny < 50:
+			else
 				noShampoo = 1
 				dynamic $showerdin
 				minut += 15
@@ -129,11 +176,17 @@ if $ARGS[0] = '':
 	else
 		!!not sweaty
 		if hour < 20:
+
+			if lernHome > 0 and katjaQW['QWstage'] >= 2: 
+				act 'Do your homework together': 
+					minut += 5
+					gt 'KatjaEv','3'
+				end
+			end
+
 			act 'Chat with Katja':
 				cla & *clr
-				KatjaHorny += 1
-				!KatjaLust += 1
-				!if npc_sex['A14'] = 1:
+				katjaQW['horny'] += 1
 				minut += 15
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
@@ -167,9 +220,9 @@ if $ARGS[0] = '':
 						act 'Go to the park': gt 'katja_sex','park'
 					end
 				elseif katjaPreg = 0 or knowKatjaPreg = 1:
-					if KatjaHorny < 50:'Katja talks about school lessons, cosmetics, the latest fashion trends and other very important things.'
-
-					if KatjaHorny >= 50:
+					if rand(0,100) > katjaQW['horny'] + min(katjaQW['slut']/2,50):
+						'Katja talks about school lessons, cosmetics, the latest fashion trends and other very important things.'
+					else
 						gs 'KatjaHomeTalk', 'Sextalk'
 						exit
 					end
@@ -195,20 +248,19 @@ if $ARGS[0] = '':
 				act 'Continue':gt 'KatjaHomeTalk'
 			end
 
-			if npc_sex['A14'] > 0 and KatjaSlut > 100:
+			if npc_sex['A14'] > 0 and katjaQW['slut'] > 100 and katjaQW['horny'] > 60:
 				act 'Look for boys in the park':
 					minut += 15
-					KatjaHorny += 5
+					katjaQW['horny'] += 5
 					$ev_name = 'Katja'
 					$ev_name_a = 'Katja'
 					$ev_name_om = 'Katja'
 					dick = 0
 					place = 1
 					Frend_num = 14
-					p_lust = KatjaLust
-					p_slut = KatjaSlut
+					p_slut = katjaQW['slut']
 					p_dom = KatjaDom
-					p_horny = KatjaHorny
+					p_horny = katjaQW['horny']
 					p_alko = 0
 					gt 'placer'
 				end
@@ -217,7 +269,7 @@ if $ARGS[0] = '':
 			act '"Let''s hang out"': 
 				cla
 				gs 'stat'
-				if meynoldQW > 1 and pcs_makeup <= 1:
+				if katjaQW['QWstage'] > 1 and pcs_makeup <= 1:
 					'"Hey! Wait a moment <<$pcs_nickname>>! I bet you would look great with a little make-up on you! What do you say?"'
 					act 'Let her put makeup on you':
 						*clr & cla
@@ -232,7 +284,7 @@ if $ARGS[0] = '':
 							cla
 							pcs_makeup = 2
 							'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
-							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+							if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 							act '"Let''s hang out"':gt 'katjaEv','kathan'
 						end
@@ -241,7 +293,7 @@ if $ARGS[0] = '':
 							cla
 							pcs_makeup = 3
 							'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+							if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 							act '"Let''s hang out"':gt 'katjaEv','kathan'
 						end
@@ -250,7 +302,7 @@ if $ARGS[0] = '':
 							cla
 							pcs_makeup = 4
 							'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
-							if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+							if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 
 							act '"Let''s hang out"':gt 'katjaEv','kathan'
 						end
@@ -262,15 +314,15 @@ if $ARGS[0] = '':
 				end 
 			end
 			
-			if KatjaLust > 10 and rand(0,5) = 0:
-				cla & *clr
-				gs 'stat'
-				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				gs 'KatjaHomeTalk', 'hornykiss'
+			if katjaQW['horny'] > rand(40,100):
+				if katjaQW['QWstage'] > 2:
+					gt 'KatjaHomeTalk', 'hornykiss'
+				else
+					gt 'KatjaHomeTalk', 'tender_kiss'
+				end
 			end
 
-			if katja_dom_sex = 1 and KatjaHorny >= 70:
+			if katja_dom_sex = 1 and katjaQW['horny'] >= 70:
 				act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 			end
 
@@ -394,7 +446,7 @@ if $ARGS[0] = 'katjaknows':
 	cla
 	npc_pregtalk['A14'] = 1
 	*nl
-	if KatjaSlut < 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+	if katjaQW['slut'] < 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -404,7 +456,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja blushes and you give her a quick kiss before she can react.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut < 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -413,7 +465,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja blushes and you give her a quick kiss before she can react.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut < 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -422,7 +474,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja blushes and you give her a quick kiss before she can react.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut < 60 and $wombthfath = '':
+	elseif katjaQW['slut'] < 60 and $wombthfath = '':
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -433,7 +485,7 @@ if $ARGS[0] = 'katjaknows':
 		'You blush and thank her, before placing a quick kiss on her cheek.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Kolka' and npc_rel['A34'] > 50:
 		minut += 10
 		'"Who''d you let pump their cum into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -444,7 +496,7 @@ if $ARGS[0] = 'katjaknows':
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Stepfather' and npc_rel['A28'] > 50:
 		minut += 10
 		'"Who''d you let pump their cum into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -455,7 +507,7 @@ if $ARGS[0] = 'katjaknows':
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfath = 'Biological Father' and npc_rel['A29'] > 50:
 		minut += 10
 		'"Who''d you let pump their cum into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -466,7 +518,7 @@ if $ARGS[0] = 'katjaknows':
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
 		act 'Continue':gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and $wombthfath = '':
+	elseif katjaQW['slut'] >= 60 and $wombthfath = '':
 		minut += 10
 		'"Who''d you let pump their cum into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -491,32 +543,32 @@ end
 if $ARGS[0] = 'katjaknows1':
 	cla
 	npc_pregtalk['A14'] = 1
-	if KatjaSlut < 60:
+	if katjaQW['slut'] < 60:
 		'"So, hot stuff. Same father as last time?"'
 	else
 		'"Fuck, I love seeing you pregnant. I hope you''re up for having lots of babies." She blushes intensely and kisses you. "So, who put this one into you?"'
 	end
 	*nl
-	if KatjaSlut < 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
+	if katjaQW['slut'] < 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
 		'You tell Katja that <<$wombthfath>> got you pregnant again.'
 		'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
 		'"I just hope he makes you happy. It''s sometimes hard to believe that you''re the woman I fell in love with." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
 
 		act 'Continue':minut += 10 & gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
+	elseif katjaQW['slut'] >= 60 and arrpos('$ChildThFath',$wombthfath) >= 0 and arrpos('$ChildThFath',$wombthfath) ! arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
 		'You tell Katja that <<$wombthfath>> got you pregnant again.'
 		'"Damn, I never thought I''d meet someone who wanted to be an incest baby factory."'
 		'"God, you''re the hottest bitch I know. I didn''t think I could be any more in love with you." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
 		'After a few minutes, she breaks the kiss, but keeps her lips millimeters from yours. "Don''t let this distract from my wanting you to become his breeding bitch. I want him to keep you pregnant. I need something to masturbate about when you’re not around." As soon as she finishes speaking, her lips are magnetically pulled back to yours.'
 
 		act 'Continue':minut += 10 & gt 'KatjaHomeTalk'
-	elseif KatjaSlut < 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
+	elseif katjaQW['slut'] < 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
 		'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
 		'Her eyes widen. "wow, your family must be really close," she giggles.'
 		'"To think I''d fall in love with a woman who lets multiple members of her own family knock her up." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
 
 		act 'Continue':minut += 10 & gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
+	elseif katjaQW['slut'] >= 60 and arrpos('$ChildThFath',$wombthfath) = arrsize('$ChildThFath')-1 and (($wombthfath = 'Kolka' and npc_rel['A34'] > 50) or ($wombthfath = 'Stepfather' and npc_rel['A28'] > 50) or ($wombthfath = 'Biological Father' and npc_rel['A29'] > 50)):
 		'Blushing, you tell Katja that a member of your family impregnated you, but this time it was <<$wombthfath>>.'
 		'Her eyes widen. "Wow, your family must be really close," she giggles.'
 		'"Shit, ‘which of your family members did you like being knocked up by the most?’ might be the hottest question anyone has ever made me think of. Just when I started thinking I couldn''t love you any more." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
@@ -531,11 +583,11 @@ if $ARGS[0] = 'katjaknows1':
 		'"I''m glad you realize you''re too special to limit yourself to one man. I love you too much to let you do anything less." Her eyes widen and her cheeks redden at the realization that she just admitted she loves you. Before you can respond, she cuts you off with a passionate kiss.'
 
 		act 'Continue':minut += 10 & gt 'KatjaHomeTalk'
-	elseif KatjaSlut < 60 and $wombthfath = '':
+	elseif katjaQW['slut'] < 60 and $wombthfath = '':
 		'"Seems like you had a little too much fun then," She chuckles.'
 
 		act 'Continue':minut += 10 & gt 'KatjaHomeTalk'
-	elseif KatjaSlut >= 60 and $wombthfath = '':
+	elseif katjaQW['slut'] >= 60 and $wombthfath = '':
 		'"Seems like you had a little too much fun then," She chuckles.'
 		'"I hope you''ll include me next time."'
 
@@ -545,9 +597,8 @@ end
 
 if $ARGS[0] = 'shower_kiss_home':
 	cla & *clr
-	KatjaLust += 10
-	KatjaSlut += 1
-	KatjaHorny += 10
+	katjaQW['slut'] += 1
+	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showerkiss.jpg"></center>'
 	'Katja gently hugs you with one hand and kisses you on the lips. You feel her soft palm on your naked pussy as her thin finger finds your clitoris and begins to rub it.'
@@ -557,19 +608,16 @@ if $ARGS[0] = 'shower_kiss_home':
 	minut -= 10
 	gs 'stat'
 
-	if KatjaSlut >= 10:
+	if katjaQW['slut'] >= 50:
 		'Katja, gently but firmly puts you on the edge of the tub.'
-	elseif KatjaSlut < 10:
+	else
 		'Katja gently caresses your clitoris with her fingers and her lips begin to kiss your neck, slowly making her way down.'
 	end
 	
 	act 'Sit on the edge of the tub':
 		cla & *clr
-		KatjaHorny -= 10
-		KatjaLust += 1
-		KatjaSlut += 1
-
-		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		katjaQW['horny'] -= 10
+		katjaQW['slut'] += 1
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
@@ -594,8 +642,7 @@ if $ARGS[0] = 'shower_kiss_home':
 			minut += 5
 			pcs_horny += 10
 			KatjaDom -= 1
-			KatjaHorny -= 10
-			KatjaLust += 1
+			katjaQW['horny'] -= 10
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -616,136 +663,167 @@ if $ARGS[0] = 'Sextalk':
 	kattalkrand = rand(0, 4)
 
 	if kattalkrand = 0:
-		if KatjaKnowBJ > 0:
+		if katjaQW['knows_BJ'] > 0:
 			'"<<$pcs_nickname>>, tell me, how are you at sucking dick."'
-		elseif KatjaKnowBJ = 0:
+		else
 			'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
 		end
 
 		if stat['bj'] > 0:
 			act 'Talk about blowjobs':
 				cls
-				KatjaLust += 5
-				KatjaHorny += 10
-				KatjaKnowBJ = 1
+				katjaQW['horny'] += 5
+				katjaQW['knows_BJ'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You tell Katja how you sucked dick and what it feels like. Katja blushes and bites her lip.'
 
+				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
+			end
+		else
+			act 'Tell Katja that you have never given a blowjob':
+				cls
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you have never given a blowjob to a guy. She admit that neither has she and says "Vicky talks about how good it is all the tiem, but I don''t know guy usually smell bad, I''m not sure it doesn''t tastes awfull".'
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 			end
 		end
 	elseif kattalkrand = 1:
-		if KatjaKnowSex > 0:
+		if katjaQW['knows_sex'] > 0:
 			'"<<$pcs_nickname>>, tell me how you have fucked."'
-		elseif KatjaKnowSex = 0:
+		else
 			'"<<$pcs_nickname>>, have you had sex with a guy?"'
 		end
 
 		if stat['vaginal'] > 0:
 			act 'Talk about sex':
 				cls
-				KatjaLust += 5
-				KatjaHorny += 10
-				KatjaKnowSex = 1
+				katjaQW['horny'] += 5
+				katjaQW['knows_sex'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You tell Katja about the times you have had sex and how it felt. Katja blushes and bites her lip.'
 
+				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
+			end
+		else
+			act 'Tell Katja that you have never had sex guy':
+				cls
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you have never had sex with a guy. She admit that neither has she and says "That probably make us to only non nerds who haven''t. Vicky does it all the time with Vanya. She wont shut up about it".'
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 			end
 		end
 
 	elseif kattalkrand = 2:
-		if KatjaKnowAnal > 0:
+		if katjaQW['knows_anal'] > 0:
 			'"<<$pcs_nickname>>, what is anal sex like?"'
-		elseif KatjaKnowAnal = 0:
+		else
 			'"<<$pcs_nickname>>, have you ever had a guy stick it in your ass?"'
 		end
 
 		if stat['anal'] > 0:
 			act 'Talk about anal':
 				cls
-				KatjaLust += 5
-				KatjaHorny += 10
-				KatjaKnowAnal = 1
+				katjaQW['horny'] += 5
+				katjaQW['knows_anal'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You told Katja about the times you have had anal sex and what it feels like. Katja blushes and bites her lip.'
 
+				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
+			end
+		else
+			act 'Tell Katja that you have never had anal sex':
+				cls
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you have never had anal sex. She says that she hears that a lot of girls in your class does.'
 				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 			end
 		end
 	elseif kattalkrand = 3:
-		if KatjaKnowKuni > 0:
+		if katjaQW['knows_cuni'] > 0 or npc_sex['A14'] > 0:
 			'"<<$pcs_nickname>>, tell me how you lick pussy."'
-		elseif KatjaKnowKuni = 0:
+		else
 			'"<<$pcs_nickname>>, have you gone down on a girl?"'
 		end
 
 		if stat['cuni'] > 0 or lesbian > 0:
 			act 'Talk about licking pussy':
 				cls
-				KatjaLust += 5
-				KatjaHorny += 10
-				KatjaKnowKuni = 1
+				katjaQW['horny'] += 5
+				katjaQW['knows_cuni'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You tell Katja about the times you have had gone down on another girl and how it feels. Katja blushes and bites her lip.'
-				'Katja asks you to show her how you lick pussy.'
+				
+				if katjaQW['horny'] > 50 and katjaQW['slut'] >= 20:
+					'Katja asks you to show her how you lick pussy.'
 
-				act 'Show her':
-					cls
-					minut += 15
-					pcs_horny += 20
-					KatjaHorny = 0
-					KatjaLust += 5
-					KatjaDom += 2
-					katja_dom_sex = 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
-					'At first you are a bit confused and then you notice she is pulling her panties off. Once she has them off she opens her legs wide. "Go on, <<$pcs_nickname>>, show me how you do it, please."'
-					'You pause a moment, more in surprise then anything, but her glistening wet pussy is enough to convince you. You lean forward and place your face between her legs and start licking.'
-					'You suck on her clit and slip your tongue inside of her, working her pussy for all you are worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you are licking her, leaving your face coated in the juices from her pussy.'
-					'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once Katja''s orgasm passes pass you lick her clean of all her pussy juices, making sure not to miss a single spot. When you raise up to look at Katja she has a smile but also a new look, you are not quite sure what it is, confidence maybe? "Well aren''t you just a good little girl." Then she kisses you deeply, breaking the kiss you start to lean back and spread your legs but she is already shaking her head no.'
-					'"Sorry <<$pcs_nickname>> maybe next time, we need to finish our homework." She says sweetly, you pause a moment and then nod in understand and you see that new look intensify on her face as she smiles, while the two of you finish your homework.'
-
-					gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
-					gs 'stat'
+					act 'Show her':
+						cls
+						minut += 15
+						pcs_horny += 20
+						katjaQW['horny'] = 0
+						katjaQW['slut'] += 1
+						KatjaDom += 2
+						katja_dom_sex = 1
+						if npc_sex['A14'] = 0: npc_sex['A14'] = 1 & girl += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
+						'At first you are a bit confused and then you notice she is pulling her panties off. Once she has them off she opens her legs wide. "Go on, <<$pcs_nickname>>, show me how you do it, please."'
+						'You pause a moment, more in surprise then anything, but her glistening wet pussy is enough to convince you. You lean forward and place your face between her legs and start licking.'
+						'You suck on her clit and slip your tongue inside of her, working her pussy for all you are worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you are licking her, leaving your face coated in the juices from her pussy.'
+						'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once Katja''s orgasm passes pass you lick her clean of all her pussy juices, making sure not to miss a single spot. When you raise up to look at Katja she has a smile but also a new look, you are not quite sure what it is, confidence maybe? "Well aren''t you just a good little girl." Then she kisses you deeply, breaking the kiss you start to lean back and spread your legs but she is already shaking her head no.'
+						'"Sorry <<$pcs_nickname>> maybe next time, we need to finish our homework." She says sweetly, you pause a moment and then nod in understand and you see that new look intensify on her face as she smiles, while the two of you finish your homework.'
+
+						gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
+						gs 'stat'
 
-					act 'Further':
-						gs 'arousal', 'end'
-						gt 'KatjaHomeTalk'
+						act 'Further':
+							gs 'arousal', 'end'
+							gt 'KatjaHomeTalk'
+						end
 					end
+					act 'Ignore her':minut += 15 & gt 'KatjaHomeTalk'
+				else
+					act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 				end
-				act 'Ignore her':minut += 15 & gt 'KatjaHomeTalk'
+			end
+		else
+			act 'Tell Katja that you have never had sex with a girl':
+				cls
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you have never had sex with another girl. She seems a little surprised and you get the feeling that this was not what she wanted to hear.'
+				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 			end
 		end
 	elseif kattalkrand = 4:
-		if KatjaKnowMastr > 0:
+		if katjaQW['knows_masterbation'] > 0:
 			'"<<$pcs_nickname>>, tell me how you masturbate."'
-		elseif KatjaKnowMastr = 0:
+		else
 			'"<<$pcs_nickname>>, do you masturbate?"'
 		end
 
 		if stat['mast'] > 0:
 			act 'Talk about masturbation':
 				cls
-				KatjaLust += 5
-				KatjaHorny += 10
-				! WD: Uninitialised ~ 'KatjaKnowMastr'
-				KatjaKnowMastr = 1
+				katjaQW['horny'] += 5
+				katjaQW['knows_masterbation'] = 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. Katja blushes and bites her lip.'
 
-				if KatjaMastr = 0:
+				if katjaQW['masturbates'] = 0:
 					act 'Further':minut += 15 & gt 'KatjaHomeTalk'
-				elseif KatjaMastr > 0:
+				else
 					act 'Further':
 						cls
-						KatjaLust += 5
-						KatjaHorny += 10
+						katjaQW['horny'] += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/mastr.jpg"></center>'
 						'Katja tells you she also masturbates, right here in this room, fondling herself between her legs.'
@@ -758,10 +836,9 @@ if $ARGS[0] = 'Sextalk':
 			if SelfFisting > 0:
 				act 'Tell her how you stuck your fist in your ass':
 					cls
-					KatjaLust += 10
-					KatjaHorny += 20
+					katjaQW['horny'] += 10
 
-					if SelfFistingKnow = 0:SelfFistingKnow = 1
+					if katjaQW['knows_self_fisting'] = 0: katjaQW['knows_self_fisting'] = 1
 
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -771,6 +848,14 @@ if $ARGS[0] = 'Sextalk':
 					act 'Further':minut += 15 & gt 'KatjaHomeTalk'
 				end
 			end
+		else
+			act 'Tell Katja that you have never masturbated':
+				cls
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You tell Katja that you have never masturbated. She seems surprised'
+				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
+			end
 		end
 	end
 
@@ -793,12 +878,12 @@ if $ARGS[0] = 'hornykiss':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 		'You move even closer to Katja''s face.'
 
-		if KatjaHorny < 50:
+		if katjaQW['horny'] < 50:
 
 			if rand(0, 50) < 15:
 				act 'Kiss': gt 'katjaEv', 'kiss'
 			else
-				KatjaHorny += 5
+				katjaQW['horny'] += 5
 				'Katja giggles and pushes your face away from her.'
 
 				act 'Change the subject':minut += 15 & gt 'KatjaHomeTalk'
@@ -807,8 +892,7 @@ if $ARGS[0] = 'hornykiss':
 					act 'Seize Katja''s face':
 						cla & *clr
 						KatjaDom -= 5
-						KatjaHorny -= 10
-						KatjaLust += 1
+						katjaQW['horny'] -= 10
 						gs 'stat'
 						'You wrapped your hands around her face and bring you lips to Katja''s.'
 
@@ -823,12 +907,73 @@ if $ARGS[0] = 'hornykiss':
 					end
 				!!end
 			end
-		elseif KatjaHorny >= 50:
+		else
 			act 'Kiss': gt 'katjaEv', 'kiss'
 		end
 	end
 end
 
+if $ARGS[0] = 'tender_kiss':
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'Katja thinks about something, then embarrassed and blushing asks you "<<$pcs_nickname>>, have you kissed a boy?"'
+
+	act 'Yes':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'You smile at Katja and say that of course you kissed boys. Katja, even more shyly, "You see <<$pcs_nickname>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Could you teach me how to kiss?"'
+
+		act 'Kiss': gt 'katjaEv', 'kiss'
+
+		gs 'willpower', 'kiss', 'resist', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'No (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You refuse to kiss Katja and she gets mad at you.'
+
+				act 'Talk about something else': gt 'KatjaHomeTalk'
+				if mey_vika['key'] = 1:
+					Act 'Leave the room': gt 'mey_home', 'start'
+				else
+					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+				end
+			end
+		else
+			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+
+	act 'No':
+		*clr & cla
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'You shake your head and say that you have never kissed a boy. Katja, even more shyly, "You see <<$pcs_nickname>>, I like this guy, he''s older than me, and I am afraid that when we start to kiss, I''ll do something wrong. Maybe we could try kissing and learn that way?"'
+		act 'Kiss': gt 'katjaEv', 'kiss'
+
+		gs 'willpower', 'kiss', 'resist', 'medium'
+		if will_cost <= pcs_willpwr:
+			act 'No (<<will_cost>> Willpower)':
+				*clr & cla
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'You refuse to kiss Katja and she gets mad at you.'
+
+				act 'Talk about something else': gt 'KatjaHomeTalk'
+				if mey_vika['key'] = 1:
+					Act 'Leave the room': gt 'mey_home', 'start'
+				else
+					act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
+				end
+			end
+		else
+			act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+end
 
 --- KatjaHomeTalk ---------------------------------
 

+ 68 - 44
locations/Katja_Tanga.qsrc

@@ -3,7 +3,7 @@
 
 if $ARGS[0] = 'secretroom':
 	*clr & cla
-	if katschoolsex = 0: katschoolsex = 1 & ! Flag sex with Kate at the school
+	if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 & ! Flag sex with Kate at the school
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga4_4.jpg"></center>'
 	'You hurry down the hall hand and hand with Katja towards the storage room she told you about. Each of you trying to pull up the others skirt. Once at the door she pulls out a key and unlocks the door, as she does you grab and squeeze her ass. As she pushes open the door she turns towards you and you both immediately start kissing and fondling each other. Barely avoid tumbling into the room, absently you manage to close the door and lock it as you''re all over each other.'
 	act 'Bare her breasts':
@@ -20,8 +20,27 @@ if $ARGS[0] = 'secretroom':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_10.jpg"></center>'
 			'After a few minutes of teasing her nipples you kiss your way down to her stomach, pulling off her skirt as you do. Your lips descend down her body and you begin kissing and teasing her clit with your tongue. You pull her down and gentle lay her down on her back, once she is laying down you slide two of your fingers into her wet pussy and begin to finger fuck her. She moans in pleasure, as her hands run all over her own body, as squeezes her own breasts.'
-			if (middildo = 1 or dildo = 1 or largedildo = 1 ) and pcs_vag > 15:
+			!!The requirements here are to make sure you own a dildo and that neither you or Katja has a hymen, since the scene does not acount for that possibility.
+			if (middildo = 1 or dildo = 1 or largedildo = 1 or bigdildo = 1 or extradildo = 1 or superdildo = 1 or maddildo = 1) and pcs_vag > 0 and npc_vag['A14'] > 0:
 				act 'Get dildo':
+					if dildonumber > 0:
+						gs 'boyStat', 'D<<dildonumber>>'
+					elseif dildo = 1:
+						gs 'boyStat', 'D1'
+					elseif middildo = 1:
+						gs 'boyStat', 'D2'
+					elseif largedildo = 1:
+						gs 'boyStat', 'D3'
+					elseif bigdildo = 1:
+						gs 'boyStat', 'D4'
+					elseif extradildo = 1:
+						gs 'boyStat', 'D5'
+					elseif superdildo = 1:
+						gs 'boyStat', 'D6'
+					elseif maddildo = 1:
+						gs 'boyStat', 'D7'
+					end 
+					
 					gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
 					gs 'stat'
 					*clr & cla
@@ -30,9 +49,10 @@ if $ARGS[0] = 'secretroom':
 					act 'Fuck Katja':
 						gs 'arousal', 'vaginal_dildo_give', -5, 'lesbian'
 						gs 'arousal', 'rimming_give', 5, 'lesbian'
-						KatjaHorny = 0
-						KatjaSlut += 2
-						KatjaLust += 2
+						if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+						if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+						katjaQW['Horny'] = 0
+						KatjaQW['Slut'] += 2
 						gs 'stat'
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_9.jpg"></center>'
@@ -45,6 +65,7 @@ if $ARGS[0] = 'secretroom':
 							$orgasm_or = 'custom'
 							gs 'arousal', 'anal_finger', -5, 'lesbian'
 							gs 'arousal', 'cuni', 5, 'lesbian'
+							gs 'arousal', 'vaginal_dildo', -5, 'lesbian'
 							gs 'arousal', 'end'
 							gs 'stat'
 							''
@@ -57,9 +78,8 @@ if $ARGS[0] = 'secretroom':
 			act 'Tongue fuck Katja':
 				*clr & cla
 				gs 'arousal', 'cuni_give', 10, 'lesbian'
-				KatjaHorny = 0
-				KatjaSlut += 2
-				KatjaLust += 2
+				katjaQW['Horny'] = 0
+				KatjaQW['Slut'] += 2
 				gs 'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_8.mp4"></video></center>'
 				'Pulling your fingers out of her twat, you run your lips down her inner thighs, till your lips are back on her clit. You kiss, lick and tease her clit with your tongue, she moans in pleasure raising her hips to try and force your tongue into her, as her wetness soaks her inner thighs and your face. Finally you slip your tongue inside of her pussy, she moans loudly and bucks against your face at first. Then she reaches down and grabs your hair, holding your head in place she grinds her crotch against your face as you tongue fuck her pussy, completely covering your face with her pussy juices. After several minutes she being moaning loudly as she cums.'
@@ -111,15 +131,15 @@ if $ARGS[0] = 'school':
 	end
 	''
 	'"I showed you mine." You state, "Now I want to know if you''re wearing any panties."'
-	act 'Katya''s turn':
+	act 'Katja''s turn':
 		*clr & cla
-		if KatjaSlut > 80 and n_tanga >= 4:
+		if katjaQW['pantiesQWstage'] = 5:
 			gt 'Katja_Tanga', 'school5'
-		elseif katschoolsex >= 1 and KatjaSlut > 60 and param = 0:
+		elseif katjaQW['school_sex'] >= 1 and KatjaQW['slut'] > 60:
 			gt 'Katja_Tanga', 'school4'
-		elseif KatjaSlut > 40 and katschoolsex = 0:
+		elseif KatjaQW['slut'] > 40:
 			gt 'Katja_Tanga', 'school3'
-		elseif KatjaSlut >= 20:
+		elseif KatjaQW['slut'] >= 20:
 			gt 'Katja_Tanga', 'school2'
 		else
 			gt 'Katja_Tanga', 'school1'
@@ -139,8 +159,7 @@ if $ARGS[0] = 'school2':
 	*clr
 	cla
 	pcs_horny += 10
-	KatjaSlut += 1
-	n_tanga += rand(0,1)
+	KatjaQW['Slut'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga3_<<i>>.jpg"></center>'
 	'Katja looked around to make sure no one else is around, then furtively lifts up her skirt, showing her panties. "See, I am wearing panties."'
 	act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -159,10 +178,11 @@ if $ARGS[0] = 'school3':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga4_2.jpg"></center>'
 		'Katja looks around to make sure that no one is watching the two of you. Then she unbuttons her shirt and pulls it open to reveal her bare breasts. With a smile you reach up and grab both her breasts in your hands and tease her nipples with your fingers, eliciting a moan of pleasure from her.'
-		if pcs_horny >= 50 and KatjaHorny >= 50 and npc_sex['A14'] > 0 and mesec <= 0:
+		if pcs_horny >= 50 and katjaQW['Horny'] >= 40 and npc_sex['A14'] > 0 and mesec <= 0 and katjaQW['school_sex'] = 0:
 			'Blushing Katja pulls away from your touch and buttons her shirt back up, but looks at you slyly and says. "I have a key to a storage closet, we can go there for a bit more privacy if you want." Giving you a hopeful look that you will agree.'
 			act 'Go': gt 'Katja_tanga', 'secretroom'
 		else
+			if katjaQW['school_sex'] = 1: katjaQW['slut'] +=1
 			'Blushing Katja pulls away from your touch and buttons her shirt back up, looking around to see if anyone had seen you grabbing her tits. "<<$pcs_nickname>> Are you crazy? Anyone could have seen us and what would they say?". '
 		end
 		act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -172,37 +192,43 @@ end
 if $ARGS[0] = 'school4':
 	*clr & cla
 	!katschoolsex=1 Flag sex with Katja at the school
-	KatjaSlut += 1
+	KatjaQW['Slut'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_1.jpg"></center>'
-	'Katja quickly lifted her skirt, showing her ass while wearing a thong. "You''re back to wearing panties again?" you cried. Katja hissed at you. "So? It''s not like you haven''t seen everything before."'
+	if katjaQW['pantiesQWstage'] = 4:
+		'Katja quickly lifted her skirt, showing her ass while wearing a thong. "You''re back to wearing panties again?" you cry. Katja hissed at you. "So? It''s not like you haven''t seen everything before."'
+	else
+		'Katja quickly lifted her skirt, showing her ass while wearing a thong. "So still wearing panties huh." you say. Katja hissed at you. "So? It''s not like you haven''t seen everything before."'
+	end
 	act 'Denied':
 		*clr & cla
 		gs 'arousal', 'kiss', -5, 'lesbian'
-		n_tanga += 1 & ! local variable
+		if katjaQW['pantiesQWstage'] < 1: katjaQW['pantiesQWstage'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss1.jpg"></center>'
 		'Dejected at her reaction. "Fine, whatever.", You said as you turned to go. Katja afraid that she had offended you, grabs your hand and pulls you into a passionate kiss. "Don''t pout sweetie, I''m sorry. Let me make it up to you." she says.'
 		act 'Watch':
 			*clr & cla
 			gs 'arousal', 'erotic', -5
-			if n_tanga = 1:
+			if katjaQW['pantiesQWstage'] = 1: 
+				katjaQW['pantiesQWstage'] = 2
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_2.jpg"></center>'
 				'Katja sits down on the floor and parts her legs as she pulls aside her panties.'
 				gs 'arousal', 'end'
-			elseif n_tanga = 2:
+			elseif katjaQW['pantiesQWstage'] = 2:
+				katjaQW['pantiesQWstage'] = 3
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_3.jpg"></center>'
 				'Turning away from you and bending over Katja lifts up her skirt and pulls down her panties, showing you her lovely ass and pussy. Hearing someone coming she quickly pulls her panties back up and straightens up her skirt, as she smiles to you shyly.'
 				gs 'arousal', 'end'
-			elseif n_tanga => 3:
+			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_4.jpg"></center>'
 				'Turning away from you and bending over Katja lifts up her skirt and pulls down her panties, showing you her lovely ass and pussy. She starts to pull up her panties as you say pouting. "Is that it?"'
 				act '"What that''s all?"':
 					*clr & cla
+					if KatjaQW['Slut'] > 80 and katjaQW['pantiesQWstage'] = 4: katjaQW['pantiesQWstage'] = 5
+					if katjaQW['pantiesQWstage'] = 3: katjaQW['pantiesQWstage'] = 4
 					gs 'arousal', 'erotic', -5
 					gs 'arousal', 'end'
-					Katja_tanga = 1 & ! 1 = Katja without panties 0 = in panties
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_5.jpg"></center>'
 					'Katja looks over her shoulder at you, biting her lower lip she looks around to make sure no one is around and with a mischievous smile. Pulls her panties down further letting them drop around her ankles. "To hell with panties then." She quickly gathers her panties off the floor and sticks them in her purse. Then she twirls in front of you, giving you a fantastic view of her pussy and bare ass.'
-					if KatjaSlut > 80 and n_tanga => 4: param = 1 & ! not come up with another way to switch to the next elseif
 					act 'Continue': gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -215,9 +241,7 @@ if $ARGS[0] = 'school5':
 	*clr & cla
 	gs 'arousal', 'erotic', -5
 	gs 'arousal', 'end'
-	KatjaSlut += 1
-	Katja_tanga = 1 & ! 1 = Katya without panties 0 = in panties
-	Katja_tanga_end = 1 & ! Flag of the end of the Event-to start the mini `s Event
+	KatjaQW['Slut'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga6_<<i>>.jpg"></center>'
 	'Without any embarrassment Katja pulls up her skirt and shows you her pussy. "Like what you see?" She asks with a teasing smile.'
 	act 'Continue': gt 'gschool_lessons', 'short_break'
@@ -227,42 +251,42 @@ if $ARGS[0] = 'dance':
 	minut += 10
 	gs 'arousal', 'flash', 5
 	gs 'stat'
-	tangaday = daystart & ! tangaday to operate once a day
+	katjaQW['no_panties_day'] = daystart & ! katjaQW['no_panties_day'] to operate once a day
 	i=rand(1,3)
 	inhib_exp += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco2_<<i>>.jpg"></center>'
 	'You lift the edge of your skirt up and flashed your pussy in front of Katja. "I showed you mine, now show me yours.".'
 	act 'Ask to see':
 		*clr & cla
-		if KatjaSlut <= 20:
-			KatjaHorny += 10
+		if KatjaQW['Slut'] <= 20:
+			katjaQW['Horny'] += 10
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco3.jpg"></center>'
 			'But Katja only blushed in embarrassment, clasping her hands. "I''m not as brave as you to go to a dance without my panties on."'
 			gs 'arousal', 'end'
-		elseif KatjaSlut <= 40:
+		elseif KatjaQW['Slut'] <= 40:
 			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
-			KatjaHorny += 10
+			katjaQW['Horny'] += 10
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco4.jpg"></center>'
 			'Katja looked around to make sure no one was watch and then turns away and partially bends over lifting her skirt. Showing you she was wearing a thong and giving you a nice view of her ass.'
-		elseif KatjaSlut <= 60:
+		elseif KatjaQW['Slut'] <= 60:
 			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
-			KatjaHorny += 10
-			KatjaSlut += 1
-			if katja_disco_Foto = 0:
-				katja_disco_Foto = 1 & !The flag in the photo
+			katjaQW['Horny'] += 10
+			KatjaQW['Slut'] += 1
+			if katjaQW['disco_Foto'] = 0:
+				katjaQW['disco_Foto'] = 1 & !The flag in the photo
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco5_1.jpg"></center>'
 				'Katja unbuttons her shirt and exposes her pretty bra. A moment later there is a brief flash as someone takes a picture, you quickly look around but can''t tell who took the picture.'
 			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco5_2.jpg"></center>'
 				'Katja unbuttons her shirt and exposes her pretty bra.'
 			end
-		elseif KatjaSlut <= 80:
-			if	KatjaHorny > 70:
+		elseif KatjaQW['Slut'] <= 80:
+			if	katjaQW['Horny'] > 70:
 				gs 'arousal', 'erotic', -5
-				KatjaHorny += 10
-				KatjaSlut += 1
+				katjaQW['Horny'] += 10
+				KatjaQW['Slut'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_1.jpg"></center>'
 				'Katja resolutely lifts her dress up to her neck,  showing not only her cute little panties, but her beautiful bare breasts. Pulling her dress back down she says. "Now show me your tits."'
 				if pcs_horny > 70 or alko > 1:
@@ -291,9 +315,9 @@ if $ARGS[0] = 'dance':
 		else
 			gs 'arousal', 'erotic', -10
 			gs 'arousal', 'end'
-			KatjaHorny += 10
-			KatjaSlut += 1
-			katja_disco_end = 1 &!Event at the end of the disc
+			katjaQW['Horny'] += 10
+			KatjaQW['Slut'] += 1
+			katjaQW['no_panties_at_disco']= 1 &!Event at the end of the disc
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco7_<<i>>.jpg"></center>'
 			'Katja does not hesitate and lifts the hem of her skirt, showing you her bare pussy.'
 		end

+ 45 - 23
locations/cikl.qsrc

@@ -144,7 +144,8 @@ if husbandMark = 1 and husband <= 10:
 	'<b><font color="red">Your husband has filed for a divorce.</font></b>'
 end
 
-if katjaPreg = 0 and month >= 2 and year > 2016: katjaPreg = 1
+!!Out commented Katja becoming pregnant until more content for a pregnant Katja is done 
+!!if katjaPreg = 0 and month >= 2 and year > 2016: katjaPreg = 1
 
 !! after having surgery you will be in recuperation for a few days
 
@@ -993,15 +994,23 @@ if shorthair = 1:
 end
 !!------------------------------------------------------------------------------------------------------------
 
-if KatjaOTN > 0:
-	if KatjaHorny > 0 and KatjaLust < 40:KatjaHorny -= rand(1, 3)
-	if KatjaLust >= 40:KatjaHorny += rand(1, 3)
-	if KatjaHorny < 0:KatjaHorny = 0
-	if KatjaHorny >= 100:KatjaHorny = 0 & KatjaMastr += 1 & KatjaLust += 1
+
+!!Modifying Katja''s arousal level.
+if katjaQW['QWstage'] > 2:
+	if katjaQW['horny'] > 0: katjaQW['horny'] += (katjaQW['slut'] - rand(1,50))/10
+	if katjaQW['horny'] < 0:katjaQW['horny'] = 0
+	if katjaQW['horny'] >= 100:
+		if rand(0,2) = 0 and week < 6:
+			katjaQW['horny'] =	max(katjaQW['slut']/2,50)
+			if katjaQW['masturbates'] = 0: katjaQW['masturbates'] = 1
+		else
+			katjaQW['horny'] = 100
+		end
+	end
 end
 
-!!Reseting if Katja have seen you are not wearing panties at the disco
-if katja_disco_end > 0: katja_disco_end = 0
+!!Reseting if Katja have shown you that she is not wearing panties at the disco
+if katjaQW['no_panties_at_disco'] > 0: katjaQW['no_panties_at_disco'] = 0
 
 if npc_rel['A69'] > 60 and rand(0,3) = 0:npc_rel['A69'] -= 1
 
@@ -1651,6 +1660,34 @@ if week = 1:
 		university['exam_week'] = 2
 	elseif university['exam_week'] = 2: 
 		university['exam_week'] = 0
+		i = 0
+		passed_count = 0
+		class_count = 0
+		:passed_exams_loop
+		if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
+			class_count += 1
+			if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_grade'']') > 40 and dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_exam_done'']') = 1:
+				passed_count += 1
+			elseif dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_exam_done'']') = 0
+				dynamic 'class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_grade''] = 0'
+				university['expelled_for_missing_exam'] = 1
+			end
+		end
+		i += 1
+		if ARRSIZE('class_list_institution') >= i: jump 'passed_exams_loop'
+		killvar 'i'
+		if passed_count = class_count: 
+			university['semester_passed'] = university['enrolled_in_semester']
+		else
+			university['expelled'] = 1
+			university['student'] = 0
+		end
+		if university['semester_passed'] = 8:
+			university['diploma'] = 1
+			university['student'] = 0
+		end
+		killvar 'class_count'
+		killvar 'passed_count'
 	end
 end
 !!------------------------------------------------------------------------------------------------------------------------
@@ -1985,21 +2022,6 @@ if rand(0,1) = 0:
 else
 	momclean2 = 25
 end
-
-!!-------------Therapist Route schedule variables----------------------------------------------------------------------
-!! 23 = kitchen
-!! 24 = Living room
-!! 25 = bathroom
-!! 26 = Master''s room
-if therapistWantsSlave > 0:
-	annaclean1 = rand(23,26)
-	if rand(0,1) = 0:
-		momclean2 = 23
-	else
-		momclean2 = 25
-	end
-end
-
 !!------------------------------------------------------------------------------------------------------------
 
 !!---------- School related schedule -------------------------------------------------------------------------

+ 1 - 1
locations/gschool_break.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'girls_restroom_events':
 			'As you leave, you wonder who Christina wants to send such a perfect photo to since you haven''t heard about her dating anyone.'
 		end
 		gs 'gschool_break', 'restroom_actions'
-	elseif girls_event_rand = 4 and npc_rel['A14'] >= 25 and npc_rel['A15'] >= 25 and (meynoldQW > 0 or mey_vika['mey_vika_qw'] > 0):
+	elseif girls_event_rand = 4 and npc_rel['A14'] >= 60 and npc_rel['A15'] >= 60 and (katjaQW['QWstage'] > 0 or mey_vika['mey_vika_qw'] > 0):
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sisters.jpg"></center>'
 		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."' 
 		'She pulls you in close on her right side and wraps one of her legs halfway around you as you hold it. Vicky wraps an arm and almost a leg around Katja from the left. The three of you do your best to strike several sexy poses as Lizaveta takes your picture. After several such pictures, the Meynold sisters each kiss you on the cheek before hurrying out. Lizaveta is a bit slower, and gives you a knowing smile before leaving as well. You wonder just what Lizaveta knows and, being the gossip that she is, who else knows as you finish your business.'

+ 50 - 51
locations/gschool_chats1.qsrc

@@ -354,16 +354,16 @@ if $ARGS[0] = 'katja':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	if KatjaOTN > 0:
-		if KatjaHorny < 20:
+	if katjaQW['QWstage'] > 2:
+		if katjaQW['Horny'] < 20:
 			'Katja looks calm and stoic.'
-		elseif KatjaHorny >= 20 and KatjaHorny < 40:
+		elseif katjaQW['Horny'] < 40:
 			'You see a naughty twinkle in Katja''s eyes.'
-		elseif KatjaHorny >= 40 and KatjaHorny < 60:
+		elseif katjaQW['Horny'] < 60:
 			'Katja has a faint blush on her cheeks and she looks at you mischievously.'
-		elseif KatjaHorny >= 60 and KatjaHorny < 80:
+		elseif katjaQW['Horny'] < 80:
 			'Katja is blushing fairly obviously and looks at you longingly.'
-		elseif KatjaHorny >= 80:
+		else
 			'Katja is as red as a lobster and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while you talk.'
 		end
 	end
@@ -396,11 +396,11 @@ if $ARGS[0] = 'katja':
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 
-	if meynoldQW = 3:
+	if katjaQW['drunk_help'] = 1:
 		act 'Thank Katja for taking you home from the disco':
 			*clr & cla
 			npc_rel['A14'] += 5
-			meynoldQW = 2
+			katjaQW['drunk_help'] = 0
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -408,7 +408,7 @@ if $ARGS[0] = 'katja':
 			'"Sure, why not?" you reply.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
-	elseif meynoldQW > 1 and pcs_makeup <= 1:
+	elseif katjaQW['QWstage'] > 1 and pcs_makeup <= 1:
 		'Katja looks at you with a smile: "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 		act 'Let her put makeup on you':
 			*clr & cla
@@ -421,7 +421,7 @@ if $ARGS[0] = 'katja':
 				cla
 				pcs_makeup = 2
 				'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
-				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				act 'Keep talking to her': gt 'gschool_chats1', 'katja'
 			end
@@ -429,7 +429,7 @@ if $ARGS[0] = 'katja':
 				cla
 				pcs_makeup = 3
 				'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
-				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				act 'Keep talking to her': gt 'gschool_chats1', 'katja'
 			end
@@ -437,20 +437,19 @@ if $ARGS[0] = 'katja':
 				cla
 				pcs_makeup = 4
 				'Katja applies some deeper, richer shades of makeup that are thick enough to cover most imperfections while drawing attention to your eyes and lips.'
-				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
+				if katjaQW['QWstage'] > 2:katjaQW['horny'] += 5*(1 + npc_sex['A14']) & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				act 'Keep talking to her': gt 'gschool_chats1', 'katja'
 			end
 		end
-	elseif meynoldQW > 1 and pcs_makeup > 1 and npc_rel['A14'] > 60:
-
-
-	    if KatjaOTN > 0 and KatjaLust > 15:
+	else
+		!!The first condiditon for kissing Katja is to check that you have kissed her before, and the second requres you to have told her about at least two of you sexual experiences when chating with her at her home.
+	    if katjaQW['QWstage'] > 2 and katjaQW['knows_masterbation'] + 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>'
 				'You lean in to kiss Katja'
-				if Katjahorny < 30:
+				if katjaQW['horny'] < 30:
 					cla & *nl
 					'She pulls away from you as you try and kiss her. She looks around to see if anyone seen you. "Not here and not now."'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -465,9 +464,9 @@ if $ARGS[0] = 'katja':
 		end
 	end
 
-	if rand(1,3) = 1 and npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:  gt 'Katja_tanga', 'start'
+	if rand(1,3) = 1 and npc_sex['A14'] > 0 and $pantyworntype = 'none' and PCloSkirt > 1 and katjaQW['no_panties_day'] ! daystart:  gt 'Katja_tanga', 'start'
 
-	if rand(1,2) = 1 and katschoolsex = 1 and pcs_horny > 40:
+	if rand(1,2) = 1 and katjaQW['school_sex'] = 1 and katjaQW['horny'] >= 40:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga_kiss.jpg"></center>'
 		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
@@ -479,54 +478,54 @@ end
 if $ARGS[0] = 'Katjaproblems':
 	cls
 	menu_off = 1
-	meynoldQW = 1
+	katjaQW['QWstage'] = 1
 	gs 'stat'
 	'<center><table><tr><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></tr></td></table></center>'
 	'You see Katja near the lockers, biting her lips and looking around nervously. Leaning against her is none other than Svyatoslav who, according to rumors, has a crush on the redhead (or was it on Christina?). He seems to be trying to convince Katja to go on a date.'
-    '"Come on Katja! It will be fun! I will pay for the popcorn!"'
-    'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
-    '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
-    *nl
+	'"Come on Katja! It will be fun! I will pay for the popcorn!"'
+	'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
+	'"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
+	*nl
 	'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder about what to do when Vicky steps between the two of them.'
-    '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you so I am forced to be an incredibly young, pretty and cool aunt!"'
-    'There are various reactions from everyone present, but her words are enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
-    '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
-    'As Svyatoslav leaves, Katja releases a long-winded sigh.'
-    gs 'stat'
+	'"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you so I am forced to be an incredibly young, pretty and cool aunt!"'
+	'There are various reactions from everyone present, but her words are enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
+	'"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
+	'As Svyatoslav leaves, Katja releases a long-winded sigh.'
+	gs 'stat'
 
 	act 'Talk with the twins':
 	    *clr & cla
 		'<center><table><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></td><td><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></td></table></center>'
 		'"Thanks Vicky. I don''t know how to tell him that I''m not interested... Sigh... But I don''t think that will make him relent... Oh <<$pcs_nickname>>! You heard us?!"'
-        'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
-        '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik, beyond paying Vitek to break his legs, you only need to hang around other people, tell him that you have a full schedule!"'
+		'You don''t answer, only looking around the crowded corridor and at a smiling Lizaveta, who is furiously recording into her phone. "Thankfully, Vicky came to her sister''s rescue."'
+		'"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik, beyond paying Vitek to break his legs, you only need to hang around other people, tell him that you have a full schedule!"'
 
 		if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
-		    '"Thanks Vicky, but I don''t want to pester you and Vanya."'
-            'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
-            '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
-            'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. You aren''t exactly friends, but you don''t dislike the idea of getting to know her a litte better.'
-            '"Yeah Katja! If I have the time, we can hang around after school."'
-            '"Um... Thanks <<$pcs_nickname>>."'
-            'After this little scene, you chat with the twins until it is time to return to class.'
+			'"Thanks Vicky, but I don''t want to pester you and Vanya."'
+			'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
+			'"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
+			'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. You aren''t exactly friends, but you don''t dislike the idea of getting to know her a litte better.'
+			'"Yeah Katja! If I have the time, we can hang around after school."'
+			'"Um... Thanks <<$pcs_nickname>>."'
+			'After this little scene, you chat with the twins until it is time to return to class.'
 		elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
-		    'Katja rests deflated against the lockers, her troubled eyes looking at you sideways.'
-            '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
-            'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
-            '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
-            'The twins proceed to give you puppy eyes. At this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with everyone looking at their cute display. Damm, the shit these girls make you do...'
-            'After this little scene, you chat with the twins until it is time to return to class.'
+			'Katja rests deflated against the lockers, her troubled eyes looking at you sideways.'
+			'"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
+			'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
+			'"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
+			'The twins proceed to give you puppy eyes. At this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with everyone looking at their cute display. Damm, the shit these girls make you do...'
+			'After this little scene, you chat with the twins until it is time to return to class.'
 		else
-		    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'
-            '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'
-            'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
-            '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
-            'Vicky joins the (now)group embrace and all you can think about how all the guys in the hall (and maybe some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
-            'After this little scene, you chat with the twins until it is time to return to class.'
+			'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'
+			'"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'
+			'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
+			'"Hey that is unjust Katja! We are sisters! I also want a hug!"'
+			'Vicky joins the (now)group embrace and all you can think about how all the guys in the hall (and maybe some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
+			'After this little scene, you chat with the twins until it is time to return to class.'
 		end
 		npc_rel['A14'] += 1
 		npc_rel['A15'] += 1
-        gs 'stat'
+		gs 'stat'
 
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end

+ 1 - 1
locations/gschool_events.qsrc

@@ -2036,7 +2036,7 @@ if $ARGS[0] = 'rand_scoolboy':
 				gs 'fame', 'pav', 'sex', 5
 				gt 'gschool_sex', 'rand_sex'
 			end
-			if katschoolsex = 1:
+			if katjaQW['school_sex'] = 1:
 				act 'Go to the back room with the guy':
 					grupvalue[1] -= 5
 					grupvalue[2] -= 5

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'main':
 			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia</a> is sitting out on the courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem</a> is waiting for you near the school entrance.'
-			if katjaMeynoldday ! daystart and meynoldQW >= 1: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja</a> is walking across the school courtyard, getting ready to go home.'
+			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja</a> is walking across the school courtyard, getting ready to go home.'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				'<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka</a> is deep in thought, as he leans against a lamp post.'
 			elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
@@ -270,7 +270,7 @@ if $ARGS[0] = 'main':
 			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
-			if katjaMeynoldday ! daystart and meynoldQW >= 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
+			if katjaQW['afterschool_hangout_day'] ! daystart and katjaQW['QWstage'] >= 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				gs 'show_table', '<a href="exec:minut += 15 & gt ''dimaHome'', ''home''">Dimka Nosov</a>', '5'
 			elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:

+ 4 - 4
locations/gschool_lessonsev3.qsrc

@@ -856,7 +856,7 @@ if $ARGS[0] = 'music':
 		school_event_hour = 1
 		scooltiperand = rand(1,22)
 		if scooltiperand = 1:
-			if Katja_tanga_end = 1 and $pantyworntype ! 'none':
+			if katjaQW['pantiesQWstage'] >= 5 and $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 				'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
@@ -893,7 +893,7 @@ if $ARGS[0] = 'music':
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 5:
-			if Katja_tanga_end = 1:
+			if katjaQW['pantiesQWstage'] >= 5:
 				pcs_horny += 10
 				gs'stat'
 				if rand(1,2) = 1:
@@ -1328,7 +1328,7 @@ if $ARGS[0] = 'art':
 		:art_event_once_more
 		scooltiperand = rand(1,19)
 		if scooltiperand = 1:
-			if Katja_tanga_end = 1 and $pantyworntype ! 'none':
+			if katjaQW['pantiesQWstage'] >= 5 and $pantyworntype ! 'none':
 				gs 'arousal', 'flash', -5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 				'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'art':
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
-			if Katja_tanga_end = 1:
+			if katjaQW['pantiesQWstage'] >= 5:
 				pcs_horny += 10
 				gs'stat'
 				if rand(1,2) = 1:

+ 6 - 6
locations/gschool_lunch.qsrc

@@ -134,7 +134,7 @@ if $ARGS[0] = 'break':
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
-	if meynoldQW = 0 and npc_rel['A14'] >= 30 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 70 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
+	if katjaQW['QWstage'] = 0 and npc_rel['A14'] >= 60 and fame['pav_slut'] < 25 and class['school_grade_average'] >= 65 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
 
 	if $breaktype ! 'long':
 		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat, did you happen to see Dimka?" "Hey <<$pcs_nickname>>, he was here earlier, speaking with Lena and Lera.'
@@ -347,7 +347,7 @@ end
 
 if $ARGS[0] = 'events':
 	menu_off = 1
-	if npc_sex['A14'] = 1 and KatjaLust >= 50 and Katjahorny + KatjaSlut >= 100 and KatjaHorny > 50:
+	if npc_sex['A14'] = 1 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 40 and katjaQW['horny'] > 60 and ivan_afterschool = 0:
 		cla
 		'During the break, Katja approaches you, her face flushed in a mixture of shame and what seems to be arousal. After a few seconds, she gathers enough courage to ask if you want go somewhere quiet with her.'
 		act 'Refuse': KatjaDom -= 1 & gt 'gschool_lunch', 'break'
@@ -357,15 +357,15 @@ if $ARGS[0] = 'events':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/petting.jpg"></center>'
 			'You nod at Katja and she quickly takes you by the hand, leading you to a small storage closet. The door has barely closed behind you when she pulls you tightly against her, kissing your lips aggressively. She leans in and softly whispers in your ear. "<<$pcs_nickname>>, I want you."'
-			if rand(1,2) = 1 and katschoolsex >= 1:
+			if rand(1,2) = 1 and katjaQW['school_sex'] >= 1:
 				act 'Go somewhere private': gt 'Katja_Tanga', 'secretroom'
 			else
 				act 'Eat Katja out':
 					*clr & cla
 					KatjaDom += 1
-					katschoolsex += 1
-					KatjaSlut += 1
-					KatjaHorny = 0
+					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 
+					katjaQW['slut'] += 1
+					katjaQW['horny'] = 0
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/lesbian.jpg"></center>'
 					'Katja lightly presses down on your shoulders, letting you know to get down on your knees in front of her as she lifts up her skirt and pulls her panties to the side. You waste no time, nuzzling at her groin as your tongue deftly starts licking her tiny clitoris. You can feel her pussy getting wetter and wetter from your thorough licking, and you enjoy the taste of her pussy a lot.'

+ 2 - 2
locations/gschool_post_shower.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'post_shower':
 			act 'Keep checking her out':
 				cla
 				if rand (1,4) = 1:
-					if npc_rel['A14'] >= 50 and KatjaHorny >= 20:
+					if npc_rel['A14'] >= 50 and katjaQW['horny'] >= 30 and npc_sex['A14']  > 0:
 						'You''re unable to pull your gaze away from her and keep watching her getting dressed until she turns and catches you staring at her. She parts her legs slightly, discreetly showing her pussy to you with a small smile before turning and giving you a barely noticeable wiggle of her ass. You smile back at her and you both finish dressing.'
 					else
 						'You''re unable to pull your gaze away from her and keep watching her getting dressed until she turns and catches you staring at her. She blushes bright red and looks a little flustered as she covers herself and turns back to her locker. She very quickly finishes dressing before grabbing her belongings and dashing out of the room. Feeling a little embarrassed, you finish getting dressed yourself.'
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'post_shower2':
 		act 'Keep checking her out':
 			cla
 			if rand (1,4) = 1:
-				if npc_rel['A14'] >= 50 and KatjaHorny >= 20:
+				if npc_rel['A14'] >= 50 and katjaQW['horny'] >= 30 and npc_sex['A14']  > 0:
 					'You''re unable to pull your gaze away from her and keep watching her showering until she turns and catches you staring at her. She parts her legs slightly and discreetly shows you her pussy while soaping up her breasts with a small smile. You smile back at her and you both finish showering.'
 				else
 					'You''re unable to pull your gaze away from her and keep watching her getting showering until she turns and catches you staring at her. She blushes bright red and looks a little flustered as she covers herself and quickly finishes showering before grabbing her towel, wrapping herself in it and dashing out of the room. Feeling a little embarrassed, you return your attention to your shower.'

+ 5 - 1
locations/gschool_sex.qsrc

@@ -119,7 +119,6 @@ if $ARGS[0] = 'afterschool':
 	menu_off = 1
 	gs 'boyStat', 'A3'
 	ivan_afterschool = 0
-	KatjaSex += 1
 	pcs_horny += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/afterschool.jpg"></center>'
@@ -132,6 +131,7 @@ if $ARGS[0] = 'afterschool':
 	act 'Continue':
 		*clr & cla
 		pcs_horny += 10
+		if dick > npc_throat['A14']: npc_throat['A14'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/doublebj.jpg"></center>'
 		'You and Katja begin kissing and pulling each other''s clothes off and within moments, you''re both naked. Breaking your kiss, you both look at Ivan, cheek to cheek. He stands there with his <<dick>>cm <<$dick_girth>> cock in his hand, stroking it as he watches the two of you.'
@@ -144,6 +144,8 @@ if $ARGS[0] = 'afterschool':
 		act 'Katja wants more':
 			*clr & cla
 			pcs_horny += 10
+			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+			if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/sex/cowgirlmissionary.jpg"></center>'
 			'Pulling away from Ivan, Katja lays down on her back. She pulls you on top of her and you are straddling her face, looking down towards her legs. Her tongue immediately begins to lap at your pussy and you feel yourself getting wet.'
@@ -179,6 +181,8 @@ if $ARGS[0] = 'afterschool':
 					minut -= 10
 					act 'Happy ending':
 						*clr & cla
+						katjaQW['slut'] += 2
+						katjaQW['Horny'] = 0
 						sexpartkno = 1
 						spafinloc = 12
 						gs 'cum_manage'

File diff suppressed because it is too large
+ 139 - 427
locations/katjaEv.qsrc


+ 145 - 131
locations/katjaEvDin.qsrc

@@ -7,27 +7,40 @@ if $ARGS[0] = 'strapon_main':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_ready.jpg"></center>'
 	!! Added a variable to check if you''ve given Katja an orgasm and are going for round 2 so that a different message will show.
-	if KatjaOrgasm ! daystart:
-		if katjahorny < 20:'Katja looks calm and indifferent.'
-		if katjahorny >= 20 and katjahorny < 40:'Katja looks at you with amusement.'
-		if katjahorny >= 40 and katjahorny < 60:'Katja has a slight blush on her cheeks and she looks at you mischievously.'
-		if katjahorny >= 60 and katjahorny < 80:'Katja blushes and languidly looks at you.'
-		if katjahorny >= 80:'Katja is red like a boiled lobster and her chest heaves from deep breathing.'
+	if KatjaQW['orgasm_day'] ! daystart:
+		if katjaQW['horny'] < 20:
+			'Katja looks calm and indifferent.'
+		elseif katjaQW['horny'] < 40:
+			'Katja looks at you with amusement.'
+		elseif katjaQW['horny'] < 60:
+			'Katja has a slight blush on her cheeks and she looks at you mischievously.'
+		elseif katjaQW['horny'] < 80:
+			'Katja blushes and languidly looks at you.'
+		else
+			'Katja is red like a boiled lobster and her chest heaves from deep breathing.'
+		end
 	else
-		if katjahorny < 20:'Katja looks calm and in control of her breathing again.'
-		if katjahorny >= 20 and katjahorny < 40:'Katja looks at you with amusement. Her breathing seems to be almost back to normal.'
-		if katjahorny >= 40 and katjahorny < 60:'Katja has a slight blush on her cheeks and she looks at you mischievously, still breathing a bit hard.'
-		if katjahorny >= 60 and katjahorny < 80:'Katja blushes and languidly looks at you, obviously still unable to get hear breath fully under control again.'
-		if katjahorny >= 80:'Katja is red like a boiled lobster and her chest heaves from gulping down all the air she can manage. You delight in the fact that you pushed her over the edge so hard.'
+		if katjaQW['horny'] < 20:
+			'Katja looks calm and in control of her breathing again.'
+		elseif katjaQW['horny'] < 40:
+			'Katja looks at you with amusement. Her breathing seems to be almost back to normal.'
+		elseif katjaQW['horny'] < 60:
+			'Katja has a slight blush on her cheeks and she looks at you mischievously, still breathing a bit hard.'
+		elseif katjaQW['horny'] < 80:
+			'Katja blushes and languidly looks at you, obviously still unable to get hear breath fully under control again.'
+		else
+			'Katja is red like a boiled lobster and her chest heaves from gulping down all the air she can manage. You delight in the fact that you pushed her over the edge so hard.'
+		end
 	end
-	if katjahorny > 10 and katjahorny < 100:
+	if katjaQW['horny'] > 10 and katjaQW['horny'] < 100:
 		act 'Make Katja suck the strap-on': gt 'KatjaEvDin', 'strapon_bj'
 		act 'Fuck Katja with the strap-on': gt 'KatjaEvDin', 'strapon_miss'
 		act 'Fuck Katja in the ass with the strap-on': gt 'KatjaEvDin', 'strapon_anal'
 	end
 
-	if katjahorny < 0:katjahorny = 0
+	if katjaQW['horny'] < 0:katjaQW['horny'] = 0
 
+	act 'Get dressed  and talk about something else': gt 'KatjaHomeTalk'
 	if mey_vika['key'] = 1:
 		Act 'Smile and leave the room': 
 			gs 'arousal', 'end'
@@ -44,7 +57,6 @@ end
 
 if $ARGS[0] = 'strapon_bj':
 	*clr & cla
-	KatjaThroat+=1
 	minut+=5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_bj.jpg"></center>'
@@ -53,28 +65,27 @@ if $ARGS[0] = 'strapon_bj':
 	gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 	gs 'stat'
 
-	if KatjaThroat >= 30:
-		KatjaSlut += 1
-		katjahorny += 5
+	if dick < npc_throat['A14']:
+		katjaQW['slut'] += 1
+		katjaQW['horny'] += 5
 		'Katja expertly swallows the strap-on to the base, Her eyes moistened, but she''s very practiced at deep throating and easily takes the dildo all the way down her throat.'
 
 		gs 'arousal', 'foreplay', 5, 'dom', 'lesbian'
 		gs 'stat'
-	end
-
-	if KatjaThroat >= 10 and KatjaThroat < 30:
-		katjahorny -= 5
+	elseif dick < npc_throat['A14']*2:
+		katjaQW['horny'] -= 5
 		'Katja tries to accommodate the dildo plunging down her throat but she keeps gagging a little, her eyes shed tears and a bit of saliva drips from her mouth but she is able to take it.'
-	end
-	if KatjaThroat < 10:
-		katjahorny -= 10
+	else
+		katjaQW['horny'] -= 10
 		'Katja tries to accommodate the dildo plunging down her throat but she keeps gagging, her eyes shed tears, snot runs from her nose, saliva drips from her mouth.'
 	end
 
-	if katjahorny >= 100:
-		katjahorny = 0
-		KatjaSlut += 5
-		KatjaOrgasm = daystart
+	if dick > npc_throat['A14']: npc_throat['A14'] += 1
+
+	if katjaQW['horny'] >= 100:
+		katjaQW['horny'] = 0
+		katjaQW['slut'] += 5
+		KatjaQW['orgasm_day'] = daystart
 		'Katja moans and bites her lip looking like she is already about to orgasm just from sucking the strap-on. "You look so pretty with that big cock slamming home in your throat baby." You say to her. Katja''s hand darts to her clit and she starts to rub herself furiously. In mere seconds she pushes herself over the edge and starts to tremble violently, all the while moaning around the big cock still pumping her throat.'
 	end
 
@@ -82,11 +93,6 @@ if $ARGS[0] = 'strapon_bj':
 end
 
 if $ARGS[0] = 'strapon_miss':
-!KatjaSex += 1
-!KatjaGuy += 1
-!KatjaBJ += 1
-!KatjaGang
-!!KatjaAnus
 	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon_miss.jpg"></center>'
@@ -97,34 +103,38 @@ if $ARGS[0] = 'strapon_miss':
 
 	if npc_vag['A14'] <= 1:
 		'Katja groans and bites her lip in pain as the strap-on enters her. You notice visible blood on the strap-on, you just popped Katja''s cherry.'
-		KatjaSlut-=10
-		katjahorny=0
+		katjaQW['slut']-=10
+		katjaQW['horny'] = 0
 		npc_vag['A14'] += 3
-	elseif dick1 > npc_vag['A14'] + 5:
-		KatjaSlut-=1
-		katjahorny-=10
+	elseif dick > npc_vag['A14'] + 5:
+		if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+		if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+		katjaQW['slut']-=1
+		katjaQW['horny'] -= 10
 		'Katja bites her lip and moans as you fuck her with the strap-on and gradually she starts to get into it, she winces from time to time from one of your hard thrusts into her, obviously hurting her a little, but she reluctantly tolerates it.'
-	elseif dick1 > npc_vag['A14'] + 3 or katjahorny < 10:
-		katjahorny += 5
-		KatjaSlut += 1
+	elseif dick > npc_vag['A14'] + 3 or katjaQW['horny'] < 10:
+		if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+		if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+		katjaQW['horny'] += 5
+		katjaQW['slut'] += 1
 		'Katja bite her lip and moans as you fuck her with the strap-on and gradually she starts to get into it, she closes her eyes enjoying the sensations.'
 	else
+		if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+		if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
 		if rand(1,2) = 2:
-			katjahorny += 10
+			katjaQW['horny'] += 10
 			'You fuck Katja hard and fast, she moans in an excited voice and rolls her eyes in pleasure'
 		else
-			katjahorny += 20
+			katjaQW['horny'] += 20
 			'You fuck Katja hard and fast, she moans in an excited voice "Faster, harder, deeper, yes fuck me!"'
 		end
-		KatjaSlut+=1
+		katjaQW['slut']+=1
 	end
 
-	KatjaSex += 1
-
-	if katjahorny >= 100:
-		katjahorny = 0
-		KatjaSlut += 5
-		KatjaOrgasm = daystart
+	if katjaQW['horny'] >= 100:
+		katjaQW['horny'] = 0
+		katjaQW['slut'] += 5
+		KatjaQW['orgasm_day'] = daystart
 		'Katja moans and bites her lip looking like she is already about to orgasm. You lock gazes with her while you increase the pace of your thrusts. After only a few seconds you feel her starting to tremble violently. You let her ride out her orgasm while you slowly push the strap-on in and out of her a few more times listening to her sweet moaning while she tries to regain her breath.'
 	end
 
@@ -140,51 +150,49 @@ if $ARGS[0] = 'strapon_anal':
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 
-	if KatjaAnus >= 30:
-		katjahorny += 10
-		KatjaSlut += 1
-		'The strap-on slides into Katja''s ass easily all the way down to balls deep into her. She moans in pleasure as you roughly fuck her ass.'
-	end
-	if KatjaAnus < 30 and KatjaAnus >= 20:
-		katjahorny += 5
-		'The strap-on slides into Katja''s ass fairly easily, you slowly work your way down until you are balls deep into her. She moans in pleasure as you roughly fuck her ass.'
-	end
-	if KatjaAnus < 20 and KatjaAnus >= 10:
-		katjahorny -= 5
-		'It takes a little bit of effort to get the strap-on to slide into Katja''s ass, you slowly work your way down until you are balls deep into her. Causing her to cry out a bit in pain. Her hands grasp at the sheets tightly, caught between intense pleasure and pain, her moans echoing both sensations.'
-	end
-	if KatjaAnus < 10 and KatjaAnus > 0:
-		KatjaSlut -= 1
-		katjahorny -= 30
-		'It takes a some effort to get the strap-on to slide into Katja''s tight ass, you slowly work your way down until you are balls deep into her. Causing her to cry out in pain. Her hands grasp at the sheets tightly, she bites the pillow as you anally fuck her with the strap-on.'
-	end
-	if KatjaAnus = 0:
-		KatjaSlut -= 5
-		katjahorny = 0
+	if npc_ass['A14'] <= 1:
+		katjaQW['slut'] -= 5
+		katjaQW['horny'] = 0
 		'Katja squeals when you push the strap-on in her very tight ass, even with all the lube it is very tight and slow going to work it balls deep into her. She cries out in pain, wincing, with tears flowing from her eyes as you fuck her ass.'
+	elseif dick > npc_ass['A14'] + 5:
+		katjaQW['slut'] -= 1
+		katjaQW['horny'] -= 30
+		'It takes a some effort to get the strap-on to slide into Katja''s tight ass, you slowly work your way down until you are balls deep into her. Causing her to cry out in pain. Her hands grasp at the sheets tightly, she bites the pillow as you anally fuck her with the strap-on.'
+	elseif dick > npc_ass['A14'] + 3 or katjaQW['horny'] < 10:
+		katjaQW['horny'] -= 5
+		'It takes a little bit of effort to get the strap-on to slide into Katja''s ass, you slowly work your way down until you are balls deep into her. Causing her to cry out a bit in pain. Her hands grasp at the sheets tightly, caught between intense pleasure and pain, her moans echoing both sensations.'
+	elseif dick > npc_ass['A14']:
+		katjaQW['horny'] += 5
+		'The strap-on slides into Katja''s ass fairly easily, you slowly work your way down until you are balls deep into her. She moans in pleasure as you roughly fuck her ass.'
+	else
+		katjaQW['horny'] += 10
+		katjaQW['slut'] += 1
+		'The strap-on slides into Katja''s ass easily all the way down to balls deep into her. She moans in pleasure as you roughly fuck her ass.'
 	end
-	KatjaAnus += 1
 
-	if katjahorny >= 100:
-		katjahorny = 0
-		KatjaSlut += 5
-		KatjaOrgasm = daystart
+	if npc_ass['A14'] < dick: npc_ass['A14'] += 1
+	if npc_ass['A14']*2 < dick: npc_ass['A14'] += 1
+
+	if katjaQW['horny'] >= 100:
+		katjaQW['horny'] = 0
+		katjaQW['slut'] += 5
+		KatjaQW['orgasm_day'] = daystart
 		'Katja moans and bites her lip looking like she is already about to orgasm. You lock gazes with her while you increase the pace of your thrusts. After only a few seconds you feel her starting to tremble violently. You let her ride out her orgasm while you slowly push the strap-on in and out of her a few more times listening to her sweet moaning while she tries to regain her breath.'
 	end
 
 	act'Further':gt 'KatjaEvDin', 'strapon_main'
 end
 
-if $ARGS[0] = 'dildo':
+if $ARGS[0] = 'strapon_start':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
-	if katjahorny >= 100: katjahorny = 80
+	if katjaQW['horny'] >= 100: katjaQW['horny'] = 80
 	'You get your handbag and pull out the toy.'
 	act 'Strap it on':
 		*clr & cla
 		minut += 3
-		gs 'boystat', 'D<<strapnumber>>', 'b'
+		gs 'boystat', 'D<<strapnumber>>'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon.jpg"></center>'
 		'You put the strap-on harness on and buckle it in place, Katja bites her lip watching your actions.'
@@ -197,9 +205,8 @@ end
 if $ARGS[0] = 'shower_kiss':
 	*clr & cla
 	menu_off = 1
-	KatjaLust += 10
-	KatjaSlut += 1
-	katjahorny += 10
+	katjaQW['slut'] += 1
+	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showerkiss.jpg"></center>'
 	'Katja gently hugs you with one hand and kisses you on the lips, you feel her soft palm on your naked pussy and her thin finger finds your clitoris and begins to rub it.'
@@ -208,19 +215,17 @@ if $ARGS[0] = 'shower_kiss':
 	gs 'arousal', 'vaginal_finger', -5, 'lesbian', 'dom'
 	gs 'stat'
 
-	if KatjaSlut >= 10:
+	if katjaQW['slut'] >= 10:
 		'Katja, gently but firmly puts you on the edge of the tub.'
-	elseif KatjaSlut < 10:
+	elseif katjaQW['slut'] < 10:
 		'Katja gently caresses your clitoris with her fingers and her lips begin to kiss your neck, slowly making her way down.'
 	end
 
 	act 'Sit on the edge of the tub':
 		*clr & cla
-		katjahorny -= 10
-		KatjaLust += 1
-		KatjaSlut += 1
+		katjaQW['horny'] -= 10
 
-		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+		if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/showersex.jpg"></center>'
@@ -254,8 +259,7 @@ if $ARGS[0] = 'shower_kiss':
 			minut += 5
 			pcs_horny += 10
 			KatjaDom -= 1
-			KatjaHorny -= 10
-			KatjaLust += 1
+			katjaQW['horny'] -= 10
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -278,8 +282,8 @@ if $ARGS[0] = 'sex':
 		if pcs_horny < 50:pcs_horny = 50
 		gs 'stat'
 
-		if KatjaSlut >= 20:
-			KatjaSlut += 1
+		if katjaQW['slut'] >= 20:
+			katjaQW['slut'] += 1
 			'Katja puts her hand between your legs. You become aroused and your pussy becomes wet.'
 
 			gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'dom'
@@ -288,12 +292,13 @@ if $ARGS[0] = 'sex':
 			act 'Spread your legs': gt 'KatjaEvDin', 'kuni_p'
 
 		else
-			KatjaLust += 1
 			'Katja is embarrassed and pulls her hand away from you.'
 
-			act 'Say goodbye and go home':
-				gs 'arousal', 'end'
-				gt 'pav_residential'
+			act 'Talk about something else': gt 'KatjaHomeTalk'
+				if mey_vika['key'] = 1:
+				Act 'Leave the room': gt 'mey_home', 'start'
+			else
+				act 'Say goodbye and go home':gt 'pav_residential'
 			end
 		end
 	end
@@ -304,9 +309,8 @@ if $ARGS[0] = 'sex':
 		if pcs_horny < 50:pcs_horny = 50
 		gs 'stat'
 
-		if KatjaSlut >= 20:
-			KatjaSlut += 1
-			KatjaLust += 1
+		if katjaQW['slut'] >= 20:
+			katjaQW['slut'] += 1
 			'You put your hand between her legs, feeling Katja''s hot and wet pussy under her panties.'
 
 			gs 'arousal', 'vaginal_finger_give', 5, 'lesbian', 'dom'
@@ -314,34 +318,35 @@ if $ARGS[0] = 'sex':
 
 			act 'Lick Katja': gt 'KatjaEvDin', 'kuni'
 		else
-			KatjaSlut += 1
-			KatjaLust += 1
+			katjaQW['slut'] += 1
 			'Katja is embarrassed and removes your hand.'
 
-			act 'Say goodbye and go home':
-				gs 'arousal', 'end'
-				gt 'pav_residential'
+			act 'Talk about something else': gt 'KatjaHomeTalk'
+			if mey_vika['key'] = 1:
+				Act 'Leave the room': gt 'mey_home', 'start'
+			else
+				act 'Say goodbye and go home':gt 'pav_residential'
 			end
 		end
 	end
 
-	if (KatjaSlut >= 20) and katjahorny >= 30 and dildo > 0:
-		act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
-	end
+	!!This is for a scene of using a dildo on Katja. But such a scene is not yet written.
+	!!if (katjaQW['slut'] >= 20) and katjaQW['horny'] >= 30 and dildo > 0:
+	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
+	!!end
 
-	if KatjaSlut >= 40 and katjahorny >= 40 and strapon > 0:
-		act 'Get your Strap On': gt 'KatjaEvDin', 'strapon_main'
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 1 and strapon > 0:
+		act 'Get your Strap On': gt 'KatjaEvDin', 'strapon_start'
 	end
 end
 
 if $ARGS[0] = 'kuni':
 	*clr & cla
 	menu_off = 1
-	KatjaSlut += 1
-	KatjaLust += 1
-	katjahorny = 0
+	katjaQW['slut'] += 1
+	katjaQW['horny'] = 0
 
-	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
@@ -355,9 +360,11 @@ if $ARGS[0] = 'kuni':
 		'Katja smiles at you "That was great <<$pcs_nickname>>. Spread your legs."'
 		act 'Spread your legs': gt 'KatjaEvDin', 'kuni_p'
 	else
-		act 'Say goodbye and go home':
-			gs 'arousal', 'end'
-			gt 'pav_residential'
+		act 'Talk about something else': gt 'KatjaHomeTalk'
+		if mey_vika['key'] = 1:
+			Act 'Smile and leave the room': gt 'mey_home', 'start'
+		else
+			act 'Say goodbye and leave':gt 'pav_residential'
 		end
 	end
 end
@@ -365,10 +372,9 @@ end
 if $ARGS[0] = 'kuni_p':
 	*clr & cla
 	menu_off = 1
-	KatjaSlut += 1
-	KatjaLust += 1
+	katjaQW['slut'] += 1
 
-	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni.jpg"></center>'
@@ -380,13 +386,15 @@ if $ARGS[0] = 'kuni_p':
 	gs 'arousal', 'cuni', 5, 'lesbian', 'dom'
 	gs 'stat'
 
-	if katjahorny > 0:
+	if katjaQW['horny'] > 0:
 		'Katja smiles at you "That was great <<$pcs_nickname>>. Come on now, my turn."'
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni'
 	else
-		act 'Say goodbye and go home':
-			gs 'arousal', 'end'
-			gt 'pav_residential'
+		act 'Talk about something else': gt 'KatjaHomeTalk'
+		if mey_vika['key'] = 1:
+			Act 'Smile and leave the room': gt 'mey_home', 'start'
+		else
+			act 'Say goodbye and leave':gt 'pav_residential'
 		end
 	end
 end
@@ -396,11 +404,10 @@ end
 if $ARGS[0] = 'kuni_dom':
 	*clr & cla
 	menu_off = 1
-	KatjaSlut += 1
-	KatjaLust += 1
-	katjahorny = 0
+	katjaQW['slut'] += 1
+	katjaQW['horny'] = 0
 
-	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
+	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & katjaQW['slut'] += 5
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
@@ -523,9 +530,11 @@ if $ARGS[0] = 'kuni_dom':
 								'You take the time to rest and relax yourself coming down from the amazing fucking you just received. A few moments later she kisses your back and your neck, before getting off you and pulling the dildo out slowly. Getting up yourself, you see her taking the harness off and tossing it aside. You notice that her thighs are slick with sweat and her own juices. Once it is off and you are facing her, she grabs you by the neck and gives you a passionate, deep, long kiss. Finally breaking the kiss "My god <<$pcs_nickname>> that was amazing. I hope I didn''t hurt you too much and you enjoyed it as much as I did. No wonder boys fuck us like that, that was amazing."'
 								'She says as she falls back on her bed laying on her back, still breathing hard and looking at you with a somewhat possessive look. You lay down next to her. "It was wonderful, I''m glad you enjoyed it too, even if you were a little rough at times." She leans over and gives you another kiss. "Sorry <<$pcs_nickname>> if I was to rough, but that was beyond description, we are going to have to do that again." The two of you lay quietly for a while, basking in the aftermath. You know something in your relationship has changed and you think for the better. After a while you get up and get dressed, you need to get going.'
 
-								act 'Go home':
-									gs 'arousal', 'end'
-									gt 'pav_residential'
+								act 'Talk about something else': gt 'KatjaHomeTalk'
+								if mey_vika['key'] = 1:
+									Act 'Leave the room': gt 'mey_home', 'start'
+								else
+									act 'Say goodbye and go home':gt 'pav_residential'
 								end
 							end
 						end
@@ -534,7 +543,12 @@ if $ARGS[0] = 'kuni_dom':
 			end
 		end
 	else
-		act 'Say goodbye and go home':gt 'pav_residential'
+		act 'Talk about something else': gt 'KatjaHomeTalk'
+		if mey_vika['key'] = 1:
+			Act 'Leave the room': gt 'mey_home', 'start'
+		else
+			act 'Say goodbye and go home':gt 'pav_residential'
+		end
 	end
 end
 

+ 8 - 8
locations/katja_sex.qsrc

@@ -166,16 +166,16 @@ if $ARGS[0] = 'prohorov_sex':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tease.jpg"></center>'
 	'You hug Katja as you meet at school, as you move down the corridor, you slip your arm around her to hold her close. From time to time some of the other students watch the two of you. As you head into a deserted hallway you notice Ivan following you. You turn to look at him and smile seductively to Katja. "Want to give him a show?"'
 	act 'Kiss':
-		KatjaHorny += 5
+		katjaQW['Horny'] += 5
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kissing.jpg"></center>'
 		'You pull Katja close as you begin to kiss each other, your tongues exploring each others mouths as your hands roam over each others bodies, you completely ignore Ivan.'
 		gs 'arousal', 'kiss', 1, 'lesbian'
 		gs 'stat'
-		if KatjaHorny >= 50:
+		if katjaQW['Horny'] >= 50:
 			act 'Kissing and more':
 				cls
-				KatjaHorny += 5
+				katjaQW['Horny'] += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/morekissing.jpg"></center>'
 				'You pull Katja close as you begin to kiss each other, your tongues exploring each others mouths as your hands roam over each others bodies, completely ignoring the boy. After a few moments of kissing you start kissing her neck as you unbutton her top, exposing her naked breasts. You kiss your way down to her breasts and being to lick and suck on her nipple.'
@@ -183,23 +183,23 @@ if $ARGS[0] = 'prohorov_sex':
 				gs 'arousal', 'foreplay_give', 2, 'lesbian'
 				minut -= 2
 				gs 'stat'
-				if KatjaHorny >= 60:
+				if katjaQW['Horny'] >= 60 and npc_sex['A14'] > 0:
 					act 'It''s getting hot':
-						KatjaHorny += 5
+						katjaQW['Horny'] += 5
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/nipplesuck.jpg"></center>'
 						'Katja begins to unbutton your shirt and pulls it off you, forcing you to break contact with her breasts. After your shirt is off, Katja immediately starts to kiss, lick and suck on your nipples, biting your lower lip as you moan in pleasure. Ivan continues to watch the two of you, but he begins to rub the large bulge in his pants.'
 						gs 'arousal', 'foreplay', 1, 'lesbian'
 						gs 'stat'
-						if KatjaHorny >= 70:
+						if katjaQW['Horny'] >= 70:
 							act 'Return to kissing':
 								cls
-								KatjaHorny += 5
+								katjaQW['Horny'] += 5
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/nakedkissing.jpg"></center>'
 								'You pull her face up to yours as the two of you being to kiss again. While your hands caress each others breasts, Katja hooks one her legs around yours as you become intertwined. You are so distracted you don''t even notice the heavy breathing coming from Ivan behind you, as he continues to watch.'
 								gs 'arousal', 'kiss', 1, 'lesbian'
 								gs 'stat'
-								if KatjaHorny >= 80:
+								if katjaQW['Horny'] >= 80:
 									act 'Lift skirt':
 										cla
 										*clr

+ 1 - 7
locations/mey_home.qsrc

@@ -89,12 +89,6 @@ if $ARGS[0] = 'start':
 			exit
 		end
 
-		! need to fuck Katja!
-		if KatjaSex >= 5 and mey_vika['mey_vika_qw'] > 35 and hour = 23 and mey_vika['mey_vika_bang_qw'] = 0:
-			gs 'mey_vika_events', 'bang_katya'
-			exit
-		end
-
 		! Vic calls in the shower
 		if mesec = 0 and pcs_vag > 0 and mey_vika['bath_qw'] = 1 and mey_vika['bath_qw_day'] ! daystart and rand(0,10) > 5 and ((week < 6 and hour >= 14) or (week = 6 and hour >= 8)):
 			gs 'mey_vika_events', 'bath_qw1'
@@ -307,7 +301,7 @@ if $ARGS[0] = '5':
 	'Katja''s room feels like someone is living there temporarily and will soon move out. The stuff in the room are in the perfect order, depicting the feeling off a "non-residential premise".'
 	'There are numerous flowers in the pots on the windowsill, there are pots hanging on the walls and there are even plants in pots on the floor giving the room a greenhouse feeling.'
 	'There is a computer desk in one of the corners, opposite of the bed. In another corner is a hidden wardrobe. Lastly a well hidden bookshelf can be seen in the room, but it is kinda hard to spot because of wildly overgrown plants.'
-	if katjaFirstKiss >= 1:
+	if katjaQW['QWstage'] > 1:
 		if (hour >= 15 and week < 6 and kanikuli = 0 and hour < 20) or (hour >= 9 and week >= 6 and kanikuli = 0 and hour < 20) or (hour >= 9 and kanikuli > 0 and hour < 20):
 			act 'Chat with Katja': gt'KatjaHomeTalk'
 		end

+ 8 - 6
locations/mey_vika_events.qsrc

@@ -1521,7 +1521,7 @@ if $ARGS[0] = 'bang_katya':
 		'Later that evening you hear Vanya and Vicky conspiring about something.'
 		'"Are you up for some fun, <<$pcs_nickname>>?" Asks Vicky.'
 		'"Well, it all depends on what you have in mind..."'
-		if KatjaSlut < 20:
+		if KatjaQW['Slut'] < 20:
 			'"We were thinking about playing a prank on my prude sister Katja!"'
 		else
 			'"We were thinking about playing a prank on my naughty sister Katja!"'
@@ -1545,6 +1545,8 @@ if $ARGS[0] = 'bang_katya':
 	end
 end
 
+
+!!The following event is no longer called and should not be added back until somebody rewrites such that it fits Vicky and Vanya''s characters.
 if $ARGS[0] = 'bang_katya2':
 	*clr & cla
 	menu_off = 1
@@ -1583,11 +1585,11 @@ if $ARGS[0] = 'bang_katya2':
 						minut += rand(15,20)
 						pcs_horny += rand(10,30)
 						mey_vika['mey_vika_bang_qw'] = 1
-						KatjaHorny = 0
+						KatjaQW['horny'] = 0
 						Katjastat['vaginal'] += 1
-						if KatjaSlut < 20:
+						if KatjaQW['slut'] < 20:
 							KatjaDom += 20
-							KatjaSlut = 0
+							KatjaQW['slut'] = 0
 						end
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya8.jpg"></center>'
@@ -1596,12 +1598,12 @@ if $ARGS[0] = 'bang_katya2':
 						'Katja wakes up and looks around shocked.'
 						'"What... What... are you doing... So it wasn''t a dream?"'
 
-						if KatjaSlut < 20:
+						if KatjaQW['Slut'] < 20:
 							'"I hate you, you fucking bitch! Get the fuck out!" Katja yells. "How could you? I know it was your idea, bitch!" She yells, frantically trying to cover herself with the blanket.'
 							'"Don''t lie, I know you liked it!" Vicky wisely jumps off the bed, away from her sister as she''s throwing a tantrum. You and Vanya also move away not wanting to get caught in the crossfire.'
 							'"Get out! So I don''t have to watch your pathetic little face!" Katja growls furiously.'
 
-						elseif KatjaSlut < 40:
+						elseif KatjaQW['Slut'] < 40:
 							'Kate hesitate and blushes, trying to cover her face with the blanket.'
 							'"To be honest... it was the best sleep I''ve ever had in my life..."'
 							'Vicky doesn''t even bat an eye. This girl doesn''t know what shame is, there is no way to embarrass her.'

+ 1 - 1
locations/nogorslut.qsrc

@@ -110,7 +110,7 @@ if fame['pav_slut'] < 250:
 		elseif numnpc = 14:
 			!!Katja Meynold
 			''
-			if KatjaOTN > 0:KatjaHorny += 10 & 'Katja blushes slightly and tries to avoid your gaze, looking away every time you look at her.'
+			if katjaQW['QWstage'] > 2: katjaQW['horny'] += 10 & 'Katja blushes slightly and tries to avoid your gaze, looking away every time you look at her.'
 		elseif numnpc = 15:
 			!!Viktoriya ''Vicky'' Meynold
 			''

+ 6 - 6
locations/pav_disco.qsrc

@@ -199,7 +199,7 @@ if $ARGS[0] = '':
 						grupvalue[4] += 1
 						'You''re having a lot of fun out on the dance floor. Most people would have a hard time telling you were drunk as you expertly move your body in a seductive manner to the beat of the music.'
 					end
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
+					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -233,7 +233,7 @@ if $ARGS[0] = '':
 							grupvalue[4] += 2
 							'You''re very drunk and forget that you don''t have any panties on. Most people would have a hard time knowing you were very drunk as you expertly move your body around in a seductive manner, but you are too drunk to notice your skirt riding up, exposing your pussy to the observant people on the dance floor with you.'
 						end
-						if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+						if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
 						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
@@ -262,7 +262,7 @@ if $ARGS[0] = '':
 							grupvalue[2] -= 1
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. Most people would have a hard time knowing you were drunk as you expertly move your body around in a seductive manner to the beat of the music.'
 						end
-						if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+						if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
 						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
@@ -276,7 +276,7 @@ if $ARGS[0] = '':
 					grupvalue[4] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
 					'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,3) = 1: 
+					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -325,7 +325,7 @@ if $ARGS[0] = '':
 				elseif alko < 4:
 					'You''re tipsy and stand against the wall, watching the others dance.'
 				elseif alko < 6:
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
+					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -335,7 +335,7 @@ if $ARGS[0] = '':
 						'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
 					end	
 				else
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 

+ 7 - 7
locations/pav_disco_coolkids.qsrc

@@ -1411,7 +1411,7 @@ if $ARGS[0] = 'katja':
 	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
-	if rand(1,4) <= 3 and meynoldQW = 2: 
+	if rand(1,4) <= 3 and katjaQW['QWstage']  > 1: 
 		'<center><b><font color="maroon">Disco</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
 		'You see Katja out on the dance floor dancing by herself.'
@@ -1461,19 +1461,19 @@ if $ARGS[0] = 'katja_dance':
 	gs 'stat'
 	*clr & cla
 	dancerand = rand(1,5)
-	if $pantyworntype = 'none' and PCloSkirt > 1 and tangaday ! daystart:
+	if $pantyworntype = 'none' and PCloSkirt > 1 and katjaQW['QWstage']  > 2 and katjaQW['no_panties_day'] ! daystart:
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance.jpg"></center>'
 		inhib_exp += rand(1,2)
 		'You dance with Katja, attracting views of guys from across the room. When you remember that you aren''t wearing panties, and your occasional spiraling of your skirt shows that fact off, it helps explain the attention.'
 		act 'Show her you are not wearing panties.': gt 'Katja_Tanga', 'dance'
-	elseif katja_disco_end = 1:
+	elseif katjaQW['no_panties_at_disco'] = 1:
 		if pcs_inhib < 40:inhib_exp += rand(1,2)
 		'<center><b><font color="maroon">Disco</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_2.jpg"></center>'
 		'You dance with Katja, attracting views of guys from across the room.'
 		act 'Expose Katja':
-			KatjaHorny += 20
+			katjaQW['horny'] += 20
 			*clr & cla
 			if dancerand = 1:
 				'<center><b><font color="maroon">Disco</font></b></center>'
@@ -1551,7 +1551,7 @@ end
 if $ARGS[0] = 'katja_walkhome':
 	*clr & cla
 	minut += 15
-	if meynoldQW = 2:meynoldQW = 3
+	katjaQW['drunk_help'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_katja.jpg"></center>'
 	if home_owned[2] = 1:

+ 6 - 8
locations/placer_act.qsrc

@@ -550,7 +550,8 @@ if plact = 1:
 						gs 'stat'
 						'<<$boydesc>> whispers in your ear: "Come on <<$pcs_nickname>>, let''s go to my place..."'
 
-						if p_slut < 50:
+						if p_slut < 50 or (Frend_num = 14 and katjaQW['park_sex'] < rand(1,2)):
+							!!If Katja have not done much with guys from the park, she might want to leave you alone.
 							'<<$ev_name>> seems to understand where this is going, and nods at you: "Okay, <<$pcs_nickname>>... I guess I should leave the two of you alone. I''ll see you later?"'
 
 							gs 'willpower', 'sex', 'resist', 'hard'
@@ -573,7 +574,7 @@ if plact = 1:
 								if tiperand = 1:gt 'fbDorm'
 								if tiperand = 2:gt 'fbGar'
 							end
-						elseif p_slut >= 50:
+						else
 							'<<$ev_name>> smiles as she licks her lips: "He''s cute, <<$pcs_nickname>>... take me with you?"'
 
 							act 'Go to his apartment together':minut += 5 & gt 'placer_house'
@@ -596,12 +597,9 @@ if plact = 1:
 							'<<$ev_name>> kisses the guy, and he begins to grope her body. She quickly whispers something in his ear, and you see him nod. Then <<$ev_name>> turns to you: "Sorry <<$pcs_nickname>>, <<$boydesc>> promised me he''d show me his cool rock collection. His apartment is small though, there''d be no room for the both of us... I''ll see you later?"'
 
 							if Frend_num = 14:
-								KatjaLust += 10
-								KatjaSlut += 10
-								KatjaHorny = 0
-								KatjaSex += 1
-								KatjaGuy += 1
-								KatjaBJ += 1
+								KatjaQW['slut'] += 10
+								KatjaQW['horny'] = 0
+								if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
 							end
 
 							act 'Watch her leave with the stranger':gt 'pav_park', 'start'

+ 8 - 8
locations/placer_end.qsrc

@@ -3,24 +3,24 @@
 
 if Frend_num = 14:
 	menu_off = 1
-	KatjaHorny += 10
+	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'You walk back home with Katja.'
-	if KatjaOhrenet > 0:
-		if KatjaOhrenet = 1:
+	if KatjaQW['sex_in_the_park_comment'] > 0:
+		if KatjaQW['sex_in_the_park_comment'] = 1:
 			'She is silent the whole way, then suddenly mutters, "Damn, I just fucked a stranger."'
-		elseif KatjaOhrenet = 2:
+		elseif KatjaQW['sex_in_the_park_comment'] = 2:
 			'She is silent the whole way, then suddenly mutters, "Damn, I just fucked two complete strangers."'
-		elseif KatjaOhrenet = 3:
+		elseif KatjaQW['sex_in_the_park_comment'] = 3:
 			'She is silent the whole way, then suddenly mutters, "Holy shit, we just fucked a whole pack of Gopnik."'
-		elseif KatjaOhrenet = 4:
+		elseif KatjaQW['sex_in_the_park_comment'] = 4:
 			'She is silent the whole way, then suddenly mutters, "Oh shit, we just fucked those strangers like a pair of complete sluts."'
-		elseif KatjaOhrenet = 5:
+		elseif KatjaQW['sex_in_the_park_comment'] = 5:
 			'She is silent the whole way, then suddenly mutters, "Shit, we just had a threesome with a stranger."'
 		end
 
-		KatjaOhrenet = 0
+		KatjaQW['sex_in_the_park_comment'] = 0
 	end
 
 	'You say goodbye and Katja disappears into her house.'

+ 4 - 6
locations/placer_gop_orgy.qsrc

@@ -13,12 +13,10 @@ guy += ciklkm
 if goporgyeQW = 0:goporgyeQW = 1
 
 if Frend_num = 14:
-	KatjaLust += 5
-	KatjaSlut += 5
-	KatjaHorny = 0
-	KatjaSex += (kol_man / 2) - 1
-	KatjaGuy += (kol_man / 2) - 1
-	KatjaOhrenet = 3
+	KatjaQW['slut'] += 5
+	KatjaQW['horny'] = 0
+	if katjaQW['park_sex'] < 3: katjaQW['park_sex'] = 3
+	KatjaQW['sex_in_the_park_comment'] = 3
 
 	gs 'arousal', 'foreplay', 10, 'group'
 	gs 'stat'

+ 37 - 37
locations/placer_house.qsrc

@@ -21,13 +21,11 @@ if kol_man = 1:
 			*clr & cla
 
 			if Frend_num = 14:
-				KatjaLust += 5
-				KatjaSlut += 5
-				KatjaHorny = 0
-				KatjaSex += 1
-				KatjaGuy += 1
-				KatjaBJ += 1
-				KatjaOhrenet = 5
+				KatjaQW['slut'] += 5
+				KatjaQW['horny'] = 0
+				if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
+				if dick > npc_throat['A14']: npc_throat['A14'] += 1
+				KatjaQW['sex_in_the_park_comment'] = 5
 			end
 
 			pose = 1
@@ -58,13 +56,13 @@ elseif kol_man = 2:
 			*clr & cla
 
 			if Frend_num = 14:
-				KatjaLust += 5
-				KatjaSlut += 5
-				KatjaHorny = 0
-				KatjaSex += 1
-				KatjaGuy += 1
-				KatjaBJ += 1
-				KatjaOhrenet = 4
+				KatjaQW['slut'] += 5
+				KatjaQW['horny'] = 0
+				if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
+				if dick > npc_throat['A14']: npc_throat['A14'] += 1
+				if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+				if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+				KatjaQW['sex_in_the_park_comment'] = 4
 			end
 
 			gs 'stat'
@@ -101,13 +99,15 @@ elseif kol_man = 3:
 			*clr & cla
 
 			if Frend_num = 14:
-				KatjaLust += 10
-				KatjaSlut += 5
-				KatjaHorny = 0
-				KatjaSex += 1
-				KatjaGuy += 1
-				KatjaBJ += 1
-				KatjaOhrenet = 1
+				gs 'npcgeneratec', 0, 'Guy', rand(18,35)
+				gs 'boyStat', $npclastgenerated
+				KatjaQW['slut'] += 5
+				KatjaQW['horny'] = 0
+				if katjaQW['park_sex'] = 0: katjaQW['park_sex'] = 1
+				if dick > npc_throat['A14']: npc_throat['A14'] += 1
+				if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+				if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+				KatjaQW['sex_in_the_park_comment'] = 1
 			end
 
 			gs 'stat'
@@ -137,14 +137,15 @@ elseif kol_man = 3:
 			*clr & cla
 
 			if Frend_num = 14:
-				KatjaLust += 5
-				KatjaSlut += 10
-				KatjaHorny = 0
-				KatjaSex += 1
-				KatjaGuy += 2
-				KatjaBJ += 2
-				KatjaGang += 1
-				KatjaOhrenet = 2
+				gs 'npcgeneratec', 0, 'Guy', rand(18,35)
+				gs 'boyStat', $npclastgenerated
+				KatjaQW['slut'] += 10
+				KatjaQW['horny'] = 0
+				if katjaQW['park_sex'] < 2: katjaQW['park_sex'] = 2
+				if dick > npc_throat['A14']: npc_throat['A14'] += 1
+				if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+				if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+				KatjaQW['sex_in_the_park_comment'] = 2
 			end
 
 			gs 'stat'
@@ -398,14 +399,13 @@ elseif kol_man >= 4:
 		gs 'boyStat', $npclastgenerated, 'b'
 		gs 'boyStat', $boy, 'a'
 		if Frend_num = 14:
-			KatjaLust += 5
-			KatjaSlut += 10
-			KatjaHorny = 0
-			KatjaSex += 1
-			KatjaGuy += 2
-			KatjaBJ += 2
-			KatjaGang += 1
-			KatjaOhrenet = 4
+			KatjaQW['slut'] += 10
+			KatjaQW['horny'] = 0
+			if katjaQW['park_sex'] < 3: katjaQW['park_sex'] = 3
+			if dick > npc_throat['A14']: npc_throat['A14'] += 1
+			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
+			if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
+			KatjaQW['sex_in_the_park_comment'] = 4
 		end
 
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/katja/dp.jpg"></center>'

+ 1 - 1
locations/placer_man.qsrc

@@ -2,7 +2,7 @@
 if mass_ver_zn > 0:
 	!!calculation of the probability of dating
 	ver_zn = 0
-	if rand(0, 30) < pcs_apprnc and rand(0, 1) = 0:
+	if rand(0, 200) < pcs_apprnc and (rand(0, 1) = 0 or Frend_num = 14):
 		ver_zn = 1
 		if kol_man = 1:
 			$kol_man_text = 'guy' & $kol_man_text_a = 'man' & $kol_man_prefiks_he = 'he'

+ 71 - 47
locations/placer_pav_park.qsrc

@@ -3,62 +3,75 @@
 if hour >= 22 or hour < 8:
 	encounter = 0
 else
-	encounter = rand(0, 6)
+	if Frend_num = 14 and katjaQW['park_sex'] < 2:
+		encounter = rand(0, 8)
+	else
+		encounter = rand(0, 10)
+	end
 end
 
 if encounter = 0:
 	!!no one in the park
 	$textEvent = 'The park is quiet and deserted. There is no one in sight.'
 elseif encounter = 1:
-	!!people in the park 0mother walking with a baby 1old_man 2woman with shopping bags 3two young girls 4number of guys 5a couple
-	encrand = rand(0, 4)
-
-	if encrand = 0:$textEvent = 'You see a young mother with a stroller walking along a path.'
-	if encrand = 1:
-		if bimbolevel < 1:
-			$textEvent = 'A lonely old man with a newspaper in his hand strolls down a path.'
-		else
-			$textEvent='A lonely old man with a newspaper in his hand is strolling down a path. He looks at you greedily when he sees your appearance and walks over to you. When he reaches you, he extends his hand and says: "Hi there, young lady! If you have a minute, come with me! I have something for you!"'
-
-			act 'Go see what he has':gs 'npcgeneratec', 0, 'Old Man from the park', rand(50,70) & gs 'boyStat', $npclastgenerated & gt 'parkBimbo','pos1'
-		end
+	!!people in the park mother walking with a baby
+	$textEvent = 'You see a young mother with a stroller walking along a path.'
+elseif encounter = 2:
+	!!people in the park old_man
+	if bimbolevel < 1 or Frend_num > 0:
+		$textEvent = 'A lonely old man with a newspaper in his hand strolls down a path.'
+	else
+		$textEvent='A lonely old man with a newspaper in his hand is strolling down a path. He looks at you greedily when he sees your appearance and walks over to you. When he reaches you, he extends his hand and says: "Hi there, young lady! If you have a minute, come with me! I have something for you!"'
+		act 'Go see what he has':gs 'npcgeneratec', 0, 'Old Man from the park', rand(50,70) & gs 'boyStat', $npclastgenerated & gt 'parkBimbo','pos1'
 	end
+elseif encounter = 3:
+	!!people in the park woman with shopping bags
+	$textEvent = 'You see a woman hauling several shopping bags though the park, they look quite heavy. It''s probably the quickest way home for her.'
+elseif encounter = 4:
+	!!people in the park two young girls
+	$textEvent = 'You see two young girls taking a stroll in the park.'
+elseif encounter = 5:
+	!!people in the park number of guys
 
-	if encrand = 2:$textEvent = 'You see a woman hauling several shopping bags though the park, they look quite heavy. It''s probably the quickest way home for her.'
-	if encrand = 3:$textEvent = 'You see two young girls taking a stroll in the park.'
-
-	if encrand = 4:
-		kol_man = rand(1, 5)
+	if Frend_num = 14 and katjaQW['park_sex'] = 0:
+		!!If Katja never have had sex with a random guy at the park you only meet 1 guy.
+		kol_man = 1
+	elseif Frend_num = 14 and katjaQW['park_sex'] = 1:
+		!!If Katja have had sex with 1 random guy at the park you have a 50% chance of meeting 1 guy and 25% of meeting 2 and 25% of meeting 3.
+		kol_man = max(1,rand(0,3))
+	elseif rand(0,1) = 0:
+		!!50% chance of meeting 1 guy.
+		kol_man = 1
+	elseif rand(0,1) = 0:
+		!!25% chance of meeting 2 guys.
+		kol_man = 2
+	elseif rand(0,1) = 0:
+		!!12.5% chance of meeting 3 guys.
+		kol_man = 3
+	elseif rand(0,2) > 0:
+		!!8.35% chance of meeting 4 guys.
+		kol_man = 4
+	else
+		!!4.15% chance of meeting 5 guys.
+		kol_man = 5
+	end
 
-		if kol_man = 1:$textSub = 'a guy'
-		if kol_man = 2:$textSub = 'two guys'
-		if kol_man = 3:$textSub = 'three guys'
-		if kol_man = 4:$textSub = 'four guys'
-		if kol_man = 5:$textSub = 'five guys'
+	if kol_man = 1:$textSub = 'a guy'
+	if kol_man = 2:$textSub = 'two guys'
+	if kol_man = 3:$textSub = 'three guys'
+	if kol_man = 4:$textSub = 'four guys'
+	if kol_man = 5:$textSub = 'five guys'
 
-		$textEvent = 'You see <<$textSub>> walking through the park, holding a case of beer.'
-		mass_ver_zn = 1
-		know_status = 1
-	end
-elseif encounter = 2:
-	!!dog in the park
-	$textEvent = 'This part of the park is quiet and deserted. The only sign of life is a stray dog, sniffing around near a garbage bin.'
-elseif encounter = 3:
-	!!young people in the park company
-	$textEvent = 'You see a group of teenagers sitting on a park bench, listening to some music.'
-	kol_man = rand(2, 6)
+	$textEvent = 'You see <<$textSub>> walking through the park, holding a case of beer.'
 	mass_ver_zn = 1
 	know_status = 1
-elseif encounter = 4:
-	!!Gopnik in the park
-	kol_man = rand(3, 6)
-	$textEvent = 'Some Gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
-	mass_ver_zn = 1
-	know_status = 2
-elseif encounter = 5:
+elseif encounter = 6:
+	!!dog in the park
+	$textEvent = 'This part of the park is quiet and deserted. The only sign of life is a stray dog, sniffing around near a garbage bin.'
+elseif encounter = 7:
 	!!couple in love in the park
 	$textEvent = 'You see a man and woman walking in the park, holding each other''s hands tightly. They''re clearly in love.'
-elseif encounter = 6:
+elseif encounter = 8:
 	if hotelcouple = 1:
 		$location_type = 'public_indoors'
 		*clr
@@ -76,11 +89,22 @@ elseif encounter = 6:
 		'You wonder what kind of ''thanks'' they have in mind'
 		hotelcouple = 2
 		jump 'parkaway'
-	else
-		$textEvent = 'You see 2 women walking in the park, holding each other''s hands tightly. They''re clearly in love.'
-	end
-elseif encounter = 7:
-!!in the square of the familiar class
+elseif encounter = 9:
+	!!young people in the park company
+	$textEvent = 'You see a group of teenagers sitting on a park bench, listening to some music.'
+	kol_man = rand(2, 6)
+	mass_ver_zn = 1
+	know_status = 1
+elseif encounter = 10:
+	!!Gopnik in the park
+	kol_man = rand(3, 6)
+	$textEvent = 'Some Gopniks are sitting on their haunches just off to the side of one of the main paths, drinking beer. The area around them is littered with empty bottles.'
+	mass_ver_zn = 1
+	know_status = 2
+else
+	$textEvent = 'You see 2 women walking in the park, holding each other''s hands tightly. They''re clearly in love.'
+end
+
 end
 
 gs 'placer_man'

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 4
-version_patch = 2
+version_patch = 3
 --- saveg ---------------------------------
 

+ 31 - 1
locations/saveupdater.qsrc

@@ -1313,8 +1313,38 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if analorgasm > 0: orgasm_anal += analorgasm
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080403:
+	!!Updating the variables for the Katja Quest line.
+
+	if meynoldQW = 1 or meynoldQW = 2: katjaQW['QWstage'] = meynoldQW & killvar 'meynoldQW'
+	if katjaFirstKiss > 0 or KatjaOTN > 0: katjaQW['QWstage'] = 3 & killvar 'katjaFirstKiss' & killvar 'KatjaOTN'
+	if katjaTanga > 0: katjaQW['pantiesQWstage'] = katjaTanga & killvar 'katjaTanga'
+	if katja_tanga_end > 0: katjaQW['pantiesQWstage'] = 5 & killvar 'katja_tanga_end'
+	if katjaSlut > 0: katjaQW['slut'] = katjaSlut & killvar 'katjaSlut'
+	if katjaHorny > 0: katjaQW['horny'] = katjaHorny & killvar 'katjaHorny'
+	if katjaSex = 1: katjaQW['park_sex'] = 1 & killvar 'katjaSex'
+	if katjaSex = 2: katjaQW['park_sex'] = 2 & killvar 'katjaSex'
+	if katjaSex > 2: katjaQW['park_sex'] = 3 & killvar 'katjaSex'
+	if KatjaMastr > 0: katjaQW['masturbates'] = KatjaMastr & killvar 'KatjaMastr'
+	if KatjaThroat > 0: npc_throat['A14'] = KatjaThroat & killvar 'KatjaThroat'
+	if KatjaAnus > 0: npc_ass['A14'] = KatjaAnus & killvar 'KatjaAnus'
+	if KatjaOrgasm > 0: KatjaQW['orgasm_day'] = KatjaOrgasm & killvar 'KatjaOrgasm'
+	if katjaMeynoldday > 0: katjaQW['afterschool_hangout_day'] = katjaMeynoldday & killvar 'katjaMeynoldday'
+	if tangaday > 0: katjaQW['no_panties_day'] = tangaday & killvar 'tangaday'
+	if KatjaKnowMastr > 0: katjaQW['knows_masterbation'] = 1 & killvar 'KatjaKnowMastr'
+	if SelfFistingKnow > 0: katjaQW['knows_self_fisting'] = 1 & killvar 'SelfFistingKnow'
+	if KatjaKnowBJ > 0: katjaQW['knows_BJ'] = 1 & killvar 'KatjaKnowBJ'
+	if KatjaKnowSex > 0: katjaQW['knows_sex'] = 1 & killvar 'KatjaKnowSex'
+	if KatjaKnowAnal > 0: katjaQW['knows_anal'] = 1 & killvar 'KatjaKnowAnal'
+	if KatjaKnowKuni > 0: katjaQW['knows_cuni'] = 1 & killvar 'KatjaKnowKuni'
+	if KatjaKnowPirsA > 0: katjaQW['know_Pirced_tongue'] = 1 & killvar 'KatjaKnowPirsA'
+	if katschoolsex > 0: katja['school_sex'] = 1 & killvar 'katschoolsex'
+	if katja_disco_Foto > 0: katjaQW['disco_Foto'] = 1 & killvar 'katja_disco_Foto'
+	if meynoldQW = 3: katjaQW['drunk_help'] = 1 & killvar 'meynoldQW'
+	if katja_disco_end > 0: katjaQW['no_panties_at_disco'] = 1 & killvar 'katja_disco_end'
+	if KatjaOhrenet > 0: KatjaQW['sex_in_the_park_comment'] = KatjaOhrenet & killvar 'KatjaOhrenet'
 
-
+end
 
 gs 'saveg'
 --- saveupdater ---------------------------------

+ 0 - 2
locations/sny.qsrc

@@ -201,8 +201,6 @@ if $ARGS[0] = '7':
 		act 'Search for Katja':
 			*clr & cla
 			SeeKatBang = 1
-			KatjaLust += 10
-			KatjaSlut += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/kat.jpg"></center>'
 			'You begin to walk around the apartment looking for Katja. Behind one of the doors, you hear a woman moaning and the creaking of a bed. You open the door just a little to peek inside. On the edge of the bed, Katja is on her knees with her head against the mattress. Slavik stands behind her and is hammering her, his cock going balls deep in her, with the slapping of flesh barely heard over Katja''s moaning. Slavik finally growls and pumps his sperm inside of her. As he finishes, he leans over her and whispers, "Katja, I''ve been in love with you for a long time, do not think I am just using you." Katja mutters something and seems completely out of it.'

+ 3 - 2
locations/stat.qsrc

@@ -90,8 +90,9 @@ end
 if lernSkill >= 8: intel_exp += 1 & lernSkill = 0
 if lern >= 10: intel_exp += 1 & lern = 0
 
-if fame['pav_slut'] >= 150 and KatjaKnowBJ ! 1: KatjaKnowBJ = 1
-if fame['pav_slut'] >= 250 or preg > 0 and KatjaKnowSex ! 1: KatjaKnowSex = 1
+!! Katja leranign about you sexual experience from other sources becaus you are a slut.
+if fame['pav_slut'] >= 150 and stat['bj'] > 0 and katjaQW['knows_BJ'] ! 1: katjaQW['knows_BJ'] = 1
+if fame['pav_slut'] >= 250 or preg > 0 and stat['vaginal'] > 0 and katjaQW['knows_sex'] ! 1: katjaQW['knows_sex'] = 1
 
 shameless = guy + stat['bj'] + stat['anal'] + stat['hj'] + ((slutty + gang) * 2)
 moneySUM = money + karta + stolmoney

Some files were not shown because too many files changed in this diff