[fixed] assorted bugfixes for Katja courtesy of julzor

locations/KatjaHomeTalk.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 
-			if npc_sex['A14'] = 1:
+			if npc_sex['A14'] > 0:
 				act 'Offer to take a walk in the Park':
 					minut += 15
 					KatjaHorny += 5

locations/katjaEv.qsrc

@@ -262,7 +262,7 @@ if $ARGS[0] = '6':
 
 		exit
 	elseif katjaDeystRand = 1:
-		if npc_sex['A14'] = 1:
+		if npc_sex['A14'] > 0:
 			if KatjaSlut <= 150:
 				'Katja invites you to take a walk in the park.'
 
@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'kathan1':
 			react_exp += 1
 			icesktng_exp += 1
 			minut += 30
-			mood +=10
+			pcs_mood +=10
 			npc_rel['A14'] += 1
 			gs 'stat'
 
@@ -1185,7 +1185,7 @@ if $ARGS[0] = 'kathan1':
 						'Before you can react, Christina has returned at full speed, scraping the lake''s frozen surface with her skates and showering you with dirty ice, before turning and leaving while laughing. Seriously? Finally, you stand with Katja''s help. It seems that, at least for a while, you have lost interest in skating. It is time to look for something else to do.'
 						gs 'stat'
 
-						act 'Continue':mood -=10 & gt 'katjaEv','kathan'
+						act 'Continue':pcs_mood -=10 & gt 'katjaEv','kathan'
 					end
 				end
 
@@ -1271,7 +1271,7 @@ end
 if $ARGS[0] = 'kathan2':
 	*clr & cla
 	minut += 30
-	mood +=10
+	pcs_mood +=10
 	npc_rel['A14'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS9.jpg"></center>'
@@ -1353,14 +1353,14 @@ if $ARGS[0] = 'kathan3':
 			'You and Katja can only look with utter prepotency towards the crestfallen girls as they retreat to treat their men. This has been fun, but it is time to look for something else to do.'
 			gs 'stat'
 
-			act 'Continue':mood +=10 & gt 'katjaEv','kathan'
+			act 'Continue':pcs_mood +=10 & gt 'katjaEv','kathan'
 		else
 			'"Oh Crap! Vanya!"'
 			'You scream sadly when, after many falls, kicks (This is hockey!) and bloodied noses, your team loses. Vanya lies on the ground tired, and you can only walk towards him with the Meynolds to try to cheer the crestfallen boy as the bitch squad giggle at your defeat.'
 			'Vicky embraces her poor boyfriend and whispers something into his ear that makes the jock smile sheepishly and get up, suddenly grab the redhead and quickly leave as a smiling Vicky winks an eye towards you. Well, it is time to look for something else to do.'
 			gs 'stat'
 
-			act 'Continue':mood -=10 & gt 'katjaEv','kathan'
+			act 'Continue':pcs_mood -=10 & gt 'katjaEv','kathan'
 		end
 	end
 
@@ -1437,7 +1437,7 @@ if $ARGS[0] = 'kathan5':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	pcs_makeup = 1
 	cumspclnt = 4 & gs 'cum_cleanup'
 
@@ -1509,7 +1509,7 @@ if $ARGS[0] = 'kathan6':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	if pcs_sweat < 35 : gs 'sweat', 'add', 5
 	pcs_tan = pcs_tan + 3
 	gs 'stat'
@@ -1548,7 +1548,7 @@ if $ARGS[0] = 'kathan7':
 	minut += 30
 	npc_rel['A14'] += 1
 	KatjaHorny += 5
-	mood += 10
+	pcs_mood += 10
 	gs 'stat'
 
 	act 'Swim': gt 'katjaEv','kathan5'
@@ -1657,7 +1657,7 @@ if $ARGS[0] = 'kathan9':
 			if $clothingworntype = 'nude' and KatjaSlut <= 20: KatjaSlut += 5
 			npc_rel['A14'] += 1
 			npc_rel['A3'] +=1
-			mood += 10
+			pcs_mood += 10
 			KatjaHorny += 5
 			gs 'stat'
 			'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
@@ -1682,8 +1682,7 @@ if $ARGS[0] = 'kathan9':
 
 				act '"Hey Ivan! You know, we are REALLY bored!"':
 					*clr & cla
-					gs 'arousal', 'kiss', '5'
-					group += 1
+					gs 'arousal', 'kiss', 5, 'group'
 					gs 'stat'
 					'<center><b><h4><font color="green"><<"Ivan Prokhorov">></font></h4></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KL9.jpg"></center>'
@@ -1694,9 +1693,9 @@ if $ARGS[0] = 'kathan9':
 
 					act 'Who is going to do the honors?':
 						*clr & cla
-						gs 'arousal', 'voyeur', '5'
-						KatjaThroat+=1
 						gs 'boyStat', 'A3'
+						gs 'arousal', 'voyeur', 5
+						KatjaThroat+=1
 						gs 'stat'
 
 						if KatjaHorny >= 40:
@@ -1978,7 +1977,7 @@ if $ARGS[0] = 'kathan10':
 	gs 'stat'
 
 	if $clothingworntype = 'nude':
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS8.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KS8.jpg"></center>'
 
 		if KatjaSlut >= 20 and KatjaHorny >= 20 and  katjaFirstKiss = 1 and KatjaOTN = 1:
 			'After undressing in the lockers, and waiting for your turn, Katja and you enter the sauna. You sit completely naked, neither you nor Katja being ashamed to show your beautiful bodies and letting the hot and humid air smooth your precious skins.'
@@ -2227,13 +2226,11 @@ end
 if $ARGS[0] = 'kathan13':
 	*clr & cla
 	menu_off = 1
-	gs 'arousal', 'vaginal_finger_give', '5', 'exhibitionism'
-	gs 'arousal', 'cuni', '5', 'exhibitionism'
 	$orgasm_or = 'yes'
+	gs 'arousal', 'vaginal_finger_give', 5, 'exhibitionism', 'lesbian'
+	gs 'arousal', 'cuni', 5, 'exhibitionism', 'lesbian'
 	pcs_mood += 10
-	girl += 1
-	lesbian += 1
-	npc_sex['A14'] += 1
+	if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] += 1
 	gs 'fame', 'pav', 'sex', rand(0,2)
 	gs 'stat'
 
@@ -2287,7 +2284,7 @@ if $ARGS[0] = 'kathan14':
 	npc_rel['A14'] += 1
 	minut += 30
 	grupvalue[1] += 1
-	if chrsm <= 45:chrsm_exp += 1
+	if pcs_chrsm <= 45:chrsm_exp += 1
 	gs 'stat'
 
 	if random_event <= 5:
@@ -2492,7 +2489,7 @@ if $ARGS[0] = 'kathan15':
 	npc_rel['A16'] += 1
 	minut += 30
 	grupvalue[1] += 1
-	if chrsm <= 45:chrsm_exp += 1
+	if pcs_chrsm <= 45:chrsm_exp += 1
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS12.jpg"></center>'
@@ -3244,22 +3241,19 @@ if $ARGS[0] = 'TamVal':
 								'Too shocked and aroused, Katja lets you lie her on the bed, take away her panties, and go down on her. She has lost any reservation to be heard, and her moans fill the room. Your assault on her pussy, united to the arousal your touch has brought, makes her happily thrash all over the bed.'
 								'You feel it when Katja raises her hips and a long guttural grunt escape her lips. She orgasms, and in that instant, a sympathetic link triggers, letting her energy flow towards you. Katja moans again and again as your feeding triggers orgasm after orgasm.'
 								'Finally, exhausted, Katja lies on the bed, cuddling against you. For the next few minutes she doesn''t say anything, and in fact, seems to be on the brink of dozing off. You begin to pick up your clothes. It is probably best if you leave now.'
-								gs 'arousal', 'vaginal_finger_give', '10'
-								gs 'arousal', 'cuni_give', '10'
+								gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
+								gs 'arousal', 'cuni_give', 10, 'lesbian'
 								pcs_mood += 20
 								KatjaSlut += 20
 								npc_rel['A14'] += 5
-								npc_sex['A14'] = 1
+								if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] = 1
 								KatjaOTN = 1
-								minut -= 5
 								npcbrokehymen = 1
 								KatjaLust += 20
 								sexnutrition += 25 * scfeed
 								suclezsex = lesbian
 								succubxp += 6
 								sucabslez = 1
-								girl += 1
-								lesbian += 1
 								gs 'stat'
 
 								act 'Time to leave': gt 'katjaEv','TamVal_2'
@@ -3430,19 +3424,14 @@ end
 
 if $ARGS[0] = 'katnatsex1':
 	*clr & cla
-	gs 'arousal', 'voyeur', '10', 'lesbian'
-	girl += 2
-	lesbian += 1
-	group += 1
+	gs 'arousal', 'voyeur', 10, 'lesbian', 'group'
 	NatbelQW['training'] += 1
 	KatjaSlut += 10
 	npc_rel['A14'] += 5
-	npc_sex['A14'] += 1
+	if npc_sex['A14'] = 0: girl += 1 & npc_sex['A14'] += 1
 	npc_rel['A16'] += 5
-	npc_sex['A16'] += 1
-	
+	if npc_sex['A16'] = 0: girl += 1 & npc_sex['A16'] += 1
 	gs 'stat'
-
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS6.jpg"></center>'
 	'"Ok Slut, this is what is going to happen. You see cute little Katja here? Well, you are coming with us and will eat her pussy like there is no tomorrow. Do that and I will condone some of your debt. Understood?"'
 	'Natasha looks at you, but doesn''t retort, She just looks to Katja for a moment and then nods. Yeah! Total control!'
@@ -3482,11 +3471,11 @@ if $ARGS[0] = 'katnatsex1':
 
 			gs 'willpower', 'cuni', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
-				act 'Force the girls to eat you':
+				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
 					KatjaDom += 5
-					gs 'arousal', 'cuni', '10', 'lesbian'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3506,8 +3495,8 @@ if $ARGS[0] = 'katnatsex1':
 			act 'Your turn!':
 				*clr & cla
 				KatjaDom += 5
-				gs 'arousal', 'cuni', '10', 'lesbian'
 				$orgasm_or = 'yes'
+				gs 'arousal', 'cuni', 10, 'lesbian'			
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3567,11 +3556,11 @@ if $ARGS[0] = 'katnatsex1':
 
 			gs 'willpower', 'cuni', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
-				act 'Force the girls to eat you':
+				act 'Force the girls to eat you (<<will_cost>> Willpower)':
 					*clr & cla
 					KatjaDom += 5
-					gs 'arousal', 'cuni', '10', 'lesbian'
 					$orgasm_or = 'yes'
+					gs 'arousal', 'cuni', 10, 'lesbian'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 
@@ -3588,11 +3577,11 @@ if $ARGS[0] = 'katnatsex1':
 				act 'Force the girls to eat you (<font color="red"><<will_cost>> Willpower</font>)': Msg '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
-		act 'You!':
+		act 'You':
 			*clr & cla
 			KatjaDom += 5
-			gs 'arousal', 'cuni', '10', 'lesbian'
 			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 10, 'lesbian'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 			'You shove Natasha away and jump on the redhead who, faking surprise, lets your tongue ravage her mouth.'
@@ -3623,12 +3612,12 @@ if $ARGS[0] = 'katnatsex1':
 		end
 	end
 
-	act 'You!':
+	act 'You':
 		menu_off = 1
 		*clr & cla
 		KatjaDom += 5
-		gs 'arousal', 'cuni', '10', 'lesbian'
 		$orgasm_or = 'yes'
+		gs 'arousal', 'cuni', 10, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS10.jpg"></center>'
 		'You shove Natasha away and jump on the redhead who, faking surprise, lets your tongue ravage her mouth.'
@@ -3659,7 +3648,7 @@ if $ARGS[0] = 'katnatsex1':
 				act 'help Katja with Natasha':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
-					gs 'arousal', 'kiss', '10', lesbian
+					gs 'arousal', 'kiss', 10, lesbian
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS11.jpg"></center>'
 
@@ -3711,7 +3700,7 @@ end
 if $ARGS[0] = 'katnatsex2':
 	*clr & cla
 	minut += 10
-	gs 'arousal', 'voyeur', '5', 'lesbian'
+	gs 'arousal', 'voyeur', 5, 'lesbian'
 	NatbelQW['Debt'] -= 500
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/KWS9.jpg"></center>'
@@ -3728,7 +3717,7 @@ end
 if $ARGS[0] = 'katnatsex3':
 	*clr & cla
 	minut += 10
-	gs 'arousal', 'voyeur', '5', 'lesbian'
+	gs 'arousal', 'voyeur', 5, 'lesbian'
 	NatbelQW['Debt'] = 0
 	npc_rel['A14'] -= 5
 	gs 'stat'

locations/katjaEvDin.qsrc

@@ -185,7 +185,6 @@ if $ARGS[0] = 'dildo':
 	act 'Strap it on':
 		*clr & cla
 		minut += 3
-		lesbian += 1
 		gs 'boystat', 'D<<strapnumber>>', 'b'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon.jpg"></center>'
@@ -207,8 +206,7 @@ if $ARGS[0] = 'shower_kiss':
 	'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.'
 
 	gs 'arousal', 'kiss', 5, 'lesbian', 'dom'
-	gs 'arousal', 'vaginal_finger', 5, 'lesbian', 'dom'
-	minut -= 5
+	gs 'arousal', 'vaginal_finger', -5, 'lesbian', 'dom'
 	gs 'stat'
 
 	if KatjaSlut >= 10:
@@ -253,7 +251,7 @@ if $ARGS[0] = 'shower_kiss':
 	gs 'willpower', 'cuni', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Remove her hands (<<will_cost>> Willpower)':
-			cls
+			*clr & cla
 			minut += 5
 			pcs_horny += 10
 			KatjaDom -= 1
@@ -401,7 +399,6 @@ if $ARGS[0] = 'kuni_dom':
 	menu_off = 1
 	KatjaSlut += 1
 	KatjaLust += 1
-	lesbian += 1
 	katjahorny = 0
 
 	if npc_sex['A14'] = 0:npc_sex['A14'] = 1 & girl += 1 & KatjaSlut += 5 & KatjaLust += 5
@@ -514,13 +511,15 @@ if $ARGS[0] = 'kuni_dom':
 								'She keeps picking up speed, soon the sounds of the skin from her hips slapping against your butt can be heard over your moaning. She seems to lose herself in the act. She stops paying attention to you. You don''t even think she would notice if you orgasmed. After a long time she starts panting. You can tell she is starting to get physically tired and worn out.'
 
 								gs 'arousal', 'anal_strap', 5, 'lesbian', 'sub', 'rough'
-								gs 'stat'
-
-								if pcs_horny = 100:
-									analorgasm += 1
+								
+								if pcs_horny >= 100:
 									$orgasm_or = 'yes'
 									$orgasm_txt = 'It is then that your orgasm hits you, it is sudden and amazingly intense.'
+									gs 'arousal', 'anal_strap', -1, 'lesbian', 'sub', 'rough'
 								end
+																
+								gs 'stat'
+								
 								'Yet she doesn''t slow down her furious pace. Finally unable to keep it up anymore she collapses on your back. You can feel the sweat from her body on your back and her heavy breathing in your ear. As she rests, half leaning against and half laying on you, with the dildo still buried it''s full length up your ass.'
 								'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.'