Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/katjaEvDin.qsrc

@@ -3,9 +3,8 @@
 
 if $ARGS[0] = 'kiss':
 	*clr & cla
-	minut += 5
 	pcs_mood = 100
-	pcs_horny += 10
+	gs 'arousal', 'kiss', 3
 	katjaQW['horny'] += 10
 
 	if katjaQW['QWstage'] < 3:
@@ -18,7 +17,6 @@ if $ARGS[0] = 'kiss':
 	end
 
 	gs 'stat'
-	gs 'katjaEvDin'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/kiss.jpg"></center>'
 	'You bring your face to Katjas face and feel her hot breath on your lips. Katja closes her eyes and touches her lips to your lips.'
 	'Katjas nimble tongue darts into your mouth, you suck on her tongue, then your tongue goes into Katja''s mouth and she very gently caressed it with her tongue and sucks on your tongue.'
@@ -29,14 +27,12 @@ if $ARGS[0] = 'kiss':
 
 		act 'Let her':
 			*clr & cla
-			minut += 5
-			pcs_horny += 10
+			gs 'arousal', 'foreplay', 3
 			katjaQW['horny'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 			'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-			gs 'boystat', 'A14', 'a'
 			gs 'KatjaEvDin', 'sex'
 		end
 
@@ -44,12 +40,12 @@ if $ARGS[0] = 'kiss':
 		if will_cost <= pcs_willpwr:
 			act 'Remove her hands (<<will_cost>> Willpower)':
 				*clr & cla
-				minut += 5
-				pcs_horny += 10
+				gs 'arousal', 'foreplay', 3
 				KatjaQW['dom'] -= 1
 				katjaQW['horny'] -= 10
 				katjaQW['horny'] = min(katjaQW['horny'], 60)
 				gs 'willpower', 'pay', 'resist'
+				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'You remove her hands and smile at Katja.'
@@ -63,8 +59,7 @@ if $ARGS[0] = 'kiss':
 		act 'Touch her chest':
 			menu_off = 1
 			*clr & cla
-			minut += 5
-			pcs_horny += 10
+			gs 'arousal', 'foreplay_give', 3
 			katjaQW['horny'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/touch.jpg"></center>'
@@ -74,14 +69,17 @@ if $ARGS[0] = 'kiss':
 				'You''re her breasts a little before Katja moves away from you.'
 				'"I''m not in the mood right now Sveta" Katja says "Another time"'
 
-				act 'Accept Katja''s decision':gt 'KatjaHomeTalk'
+				act 'Accept Katja''s decision':
+					gs 'arousal', 'end'
+					gs 'stat'
+					gt 'KatjaHomeTalk'
+				end
 
 				gs 'willpower', 'sex', 'force', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Grab her (<<will_cost>> Willpower)':
 						*clr & cla
-						minut += 5
-						pcs_horny += 10
+						gs 'arousal', 'foreplay_give', 3
 						KatjaQW['dom'] -= 1
 						katjaQW['horny'] -= 10
 						gs 'stat'
@@ -89,6 +87,8 @@ if $ARGS[0] = 'kiss':
 						'You grab Katja firmly so she can''t back away.'
 !!{
 						if pcs_dom < KatjaQW['dom']:
+							gs 'arousal', 'end'
+							gs 'stat'
 							'Katja pushes your arms apart and pulls away, you understand that she doesn''t want more.'
 
 							if mey_vika['key'] = 1:
@@ -101,14 +101,12 @@ if $ARGS[0] = 'kiss':
 
 							act 'Lick her breast':
 								*clr & cla
-								minut += 5
-								pcs_horny += 10
+								gs 'arousal', 'foreplay_give', 3
 								katjaQW['horny'] += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits_katja_get.jpg"></center>'
 								'You free Katja''s small, firm breasts from under her clothes and begin to lick them, paying special attention to her nipples. Katja closed her eyes in pleasure and bites her lip.'
 
-								gs 'boystat', 'A14', 'a'
 								gs 'KatjaEvDin', 'sex'
 							end
 						end
@@ -122,15 +120,12 @@ if $ARGS[0] = 'kiss':
 
 				act 'Let her':
 					*clr & cla
-					minut += 5
-					pcs_horny += 10
+					gs 'arousal', 'foreplay', 3
 					katjaQW['horny'] += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 					'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-
-					gs 'boystat', 'A14', 'a'
 					gs 'KatjaEvDin', 'sex'
 				end
 
@@ -143,27 +138,25 @@ if $ARGS[0] = 'kiss':
 
 					act 'Give in to her touch':
 						*clr & cla
-						minut += 5
-						pcs_horny += 10
+						gs 'arousal', 'foreplay', 3
 						KatjaQW['dom'] += 1
 						katjaQW['horny'] += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tits.jpg"></center>'
 						'Katja bares your breasts and touches them with her fingers, then she bows her head and begins to lick your nipple.'
 
-						gs 'boystat', 'A14', 'a'
 						gs 'KatjaEvDin', 'sex'
 					end
 					
 					if will_cost <= pcs_willpwr:
 						act 'Remove her hands (<<will_cost>> Willpower)':
 							*clr & cla
-							minut += 5
-							pcs_horny += 10
+							gs 'arousal', 'foreplay', 3
 							KatjaQW['dom'] -= 1
 							katjaQW['horny'] -= 10
 							katjaQW['horny'] = min(katjaQW['horny'], 60)
 							gs 'willpower', 'pay', 'resist'
+							gs 'arousal', 'end'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 							'You remove her hands and smile at Katja.'
@@ -177,6 +170,8 @@ if $ARGS[0] = 'kiss':
 			end
 		end
 	else
+		gs 'arousal', 'end'
+		gs 'stat'
 		'Katja turns and begins collecting books, pretending that nothing has happened.'
 
 		act 'Talk about something else': gt 'KatjaHomeTalk'
@@ -413,11 +408,20 @@ if $ARGS[0] = 'sex':
 			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and pulls her hand away from you.'
 
-			act 'Talk about something else': gt 'KatjaHomeTalk'
-				if mey_vika['key'] = 1:
-				act 'Leave the room': gt 'mey_home', 'start'
+			act 'Talk about something else':
+				gs 'arousal', 'end'
+				gt 'KatjaHomeTalk'
+			end
+			if mey_vika['key'] = 1:
+				act 'Leave the room': 
+					gs 'arousal', 'end'
+					gt 'mey_home', 'start'
+				end
 			else
-				act 'Say goodbye and go home':gt 'pav_residential'
+				act 'Say goodbye and go home':
+					gs 'arousal', 'end'
+					gt 'pav_residential'
+				end
 			end
 		end
 	end
@@ -441,11 +445,20 @@ if $ARGS[0] = 'sex':
 			katjaQW['horny'] = min(katjaQW['horny'], 40)
 			'Katja is embarrassed and removes your hand.'
 
-			act 'Talk about something else': gt 'KatjaHomeTalk'
+			act 'Talk about something else':
+				gs 'arousal', 'end'
+				gt 'KatjaHomeTalk'
+			end
 			if mey_vika['key'] = 1:
-				Act 'Leave the room': gt 'mey_home', 'start'
+				act 'Leave the room': 
+					gs 'arousal', 'end'
+					gt 'mey_home', 'start'
+				end
 			else
-				act 'Say goodbye and go home':gt 'pav_residential'
+				act 'Say goodbye and go home':
+					gs 'arousal', 'end'
+					gt 'pav_residential'
+				end
 			end
 		end
 	end
@@ -458,6 +471,10 @@ if $ARGS[0] = 'sex':
 	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and strapon > 0:
 		act 'Get your strap-on': gt 'KatjaEvDin', 'strapon_start'
 	end
+
+	if katjaQW['slut'] >= 40 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0 and  katjaQW['fisted_vag'] > 0:
+		act 'Use your fist on Katja': gt 'KatjaEvDin', 'fisting'
+	end
 end
 
 if $ARGS[0] = 'kuni':
@@ -480,11 +497,62 @@ 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 'Talk about something else': gt 'KatjaHomeTalk'
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
 		if mey_vika['key'] = 1:
-			Act 'Smile and leave the room': gt 'mey_home', 'start'
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
 		else
-			act 'Say goodbye and leave':gt 'pav_residential'
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'fisting':
+	*clr & cla
+	menu_off = 1
+	katjaQW['slut'] += 1
+	katjaQW['horny'] = 0
+	if npc_vag['A14'] < 33: 
+		npc_vag['A14'] += 3
+	else 
+		npc_vag['A14'] = 36
+	end
+	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/home/fisting/fisting_repeat.jpg"></center>'
+	'After making sure Katja was well lubed and ready, she lays back to spread her legs for you. As she massages her clit with a toy, you slide your fingers in one at a time, working them in, out and around, bringing her pleasure with each thrust, she cries out in orgasm more than once, which makes her more wet and ready.'
+	'With a final push, you tuck your thumb in and curl your hand to slide it all the way in, till her netherlips wraps around your wrist. You give her only a few moments rest before twisting and thrust your hand more vigorously within her sex. It doesn''t take Katja long before her climax breaks again, she arches her back and attempts to keep her voice down as you continue to move your hand and fingers inside of her, but eventually you slow down and slide your hand out of her.'
+	'Katja Tries to catch her breath as she continues to have aftershock orgasms, while you watch as her sex closes slowly around something that isn''t there. Eventually you climb up and lay next to her, holding her as she shakes with her final orgasms and kissing her softly until you are ready for something else...'
+
+	gs 'arousal', 'vaginal_fist_give', 5, 'lesbian'
+	gs 'stat'
+
+	if pcs_horny >= 50:
+		act 'Ask Katja to go down on you': gt 'KatjaEvDin', 'kuni_p'
+	else
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
+		if mey_vika['key'] = 1:
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
+		else
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
 		end
 	end
 end
@@ -510,11 +578,20 @@ if $ARGS[0] = 'kuni_p':
 		'Katja smiles at you "That was great <<$pcs_nickname>>. Come on now, my turn."'
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni'
 	else
-		act 'Talk about something else': gt 'KatjaHomeTalk'
+		act 'Talk about something else':
+			gs 'arousal', 'end'
+			gt 'KatjaHomeTalk'
+		end
 		if mey_vika['key'] = 1:
-			Act 'Smile and leave the room': gt 'mey_home', 'start'
+			act 'Leave the room': 
+				gs 'arousal', 'end'
+				gt 'mey_home', 'start'
+			end
 		else
-			act 'Say goodbye and leave':gt 'pav_residential'
+			act 'Say goodbye and go home':
+				gs 'arousal', 'end'
+				gt 'pav_residential'
+			end
 		end
 	end
 end
@@ -547,6 +624,7 @@ if $ARGS[0] = 'kuni_dom':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Say goodbye and go home (<<will_cost>> Willpower)':
+					gs 'arousal', 'end'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					gt 'pav_residential'
@@ -566,6 +644,7 @@ if $ARGS[0] = 'kuni_dom':
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
 					act 'Decline and go home (<<will_cost>> Willpower)':
+						gs 'arousal', 'end'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						gt 'pav_residential'
@@ -596,6 +675,7 @@ if $ARGS[0] = 'kuni_dom':
 						gs 'willpower', 'vaginal', 'resist', 'hard'
 						if will_cost <= pcs_willpwr:
 							act 'Decline and go home (<<will_cost>> Willpower)':
+								gs 'arousal', 'end'
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
 								gt 'pav_residential'
@@ -621,6 +701,7 @@ if $ARGS[0] = 'kuni_dom':
 							gs 'willpower', 'anal', 'resist', 'hard'
 							if will_cost <= pcs_willpwr:
 								act 'Decline and go home (<<will_cost>> Willpower)':
+									gs 'arousal', 'end'
 									gs 'willpower', 'pay', 'resist'
 									gs 'stat'
 									gt 'pav_residential'
@@ -645,6 +726,7 @@ if $ARGS[0] = 'kuni_dom':
 									gs 'arousal', 'anal_strap', -1, 'lesbian', 'sub', 'rough'
 								end
 								
+								gs 'arousal', '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 her sweat on your back and her heavy breathing in your ear as she rests against with the dildo still firmly up your ass.'
@@ -664,6 +746,7 @@ if $ARGS[0] = 'kuni_dom':
 			end
 		end
 	else
+		gs 'arousal', 'end'
 		act 'Talk about something else': gt 'KatjaHomeTalk'
 		if mey_vika['key'] = 1:
 			Act 'Leave the room': gt 'mey_home', 'start'

locations/katja_sex.qsrc

@@ -929,7 +929,7 @@ if $ARGS[0] = 'first_fisting':
 										end
 										katjaQW['horny'] = 0
 										katjaQW['slut'] += 5
-										katjaQW['fisted_vag'] = 1
+										if katjaQW['fisted_vag'] = 0:  katjaQW['fisted_vag'] = 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/home/fisting/fisting9.jpg"></center>'
 										'As you are sliding your body up and climbing up on top of Katja to hold her, her body still shakes as she deals with the aftershocks. You lost count how many times she cried out in new pleasure. She finally lets the buzzing toy drop to the side of the bed, wraps you in her arms and kisses you deeply. "Oh My God...oh my god....my body won''t stop...what did you do to me?...Ahhhh" she gasps out, as another one hits her stronger than the last few, she holds you tighter and squeezes you more as she rides through it, and relaxes afterwards, breathing heavily as if she just ran a marathon. "We definitely need to do that again, but not right away, I think I need to recover after that." '

locations/selfplay.qsrc

@@ -764,9 +764,10 @@ if $ARGS[0] = 'fingering2':
 
 		'<<$AnyaMsg>>'
 
-		gs 'selfplay', 'fingering2', 1
-
-		if org_temp = orgasm and pcs_vag > 0: gs 'selfplay', 'fingering3'
+		if org_temp = orgasm:
+			gs 'selfplay', 'fingering2', 1
+			if pcs_vag > 0: gs 'selfplay', 'fingering3'
+		end
 
 		act 'Stop touching yourself':gt 'selfplay', 'stop'
 	end
@@ -807,46 +808,132 @@ if $ARGS[0] = 'fingering3':
 
 		'<<$AnyaMsg>>'
 
-		if org_temp = orgasm:
-			act 'Fuck yourself with your fingers':
-				cls
-				selfplaytime += 10
-				gs 'selfplay', 'sis_prov'
+		if org_temp = orgasm: gs 'selfplay', 'fingering4'
 
-				if pcs_vag < 10:
-					if vgape = 2:vgape = 3
-					if vgape = 1:vgape = 2
-					if vgape = 0:vgape = 1
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
+end
 
-					pcs_horny -= 10
-					pcs_mood -= 10
-				end
+if $ARGS[0] = 'fingering4':
+	act 'Fuck yourself with your fingers':
+		cls
+		selfplaytime += 10
+		gs 'selfplay', 'sis_prov'
+
+		if pcs_vag < 10:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+		end
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
+		if args[1] = 1:
+			'You continue to move your hand, thrusting your fingers into your pussy again and again.'
+		else
+			'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+		end
 
-				'<center><img <<$set_imgh>> src="images/shared/sex/mast/hand.jpg"></center>'
-				'You start to slowly move your hand, thrusting your fingers into your pussy again and again.'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate'
+		gs 'stat'
 
-				gs 'arousal', 'vaginal_finger', 10, 'masturbate'
-				gs 'stat'
+		if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+		if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+
+		gs 'stat'
+
+		if pcs_vag < 20:vaginaTemp += 1
+
+		'<<$AnyaMsg>>'
 
-				if pcs_vag <= 15:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
-				if pcs_vag > 10:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the finger fucking, and you feel a pleasant warmth spread in your lower body.'
+		if org_temp = orgasm:
+			gs 'selfplay', 'fingering4', 1
+			if pcs_vag > 10: gs 'selfplay', 'self_fisting_1'
+		end
 
-				gs 'stat'
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
+end
 
-				if pcs_vag < 20:vaginaTemp += 1
+if $ARGS[0] = 'self_fisting_1':
+	act 'Thrust your whole hand into your vagina':
+		cls
+		selfplaytime += 2
+		gs 'selfplay', 'sis_prov'
 
-				'<<$AnyaMsg>>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/self_fisting.jpg"></center>'
 
-				gs 'selfplay', 'fingering3'
+		'You shove your whole hand inside your pussy.'
 
-				act 'Stop touching yourself':gt 'selfplay', 'stop'
-			end
+		if pcs_vag < 15:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+			'You shove your whole hand inside your tight pussy, and feel it stretch out way more than it should. It''s rather painful.'
+		elseif pcs_vag < 20:
+			pcs_horny += rand(1, 3)
+			'You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly. It doesn''t hurt, but doesn''t feel very good either.'
+		elseif pcs_vag < 25:
+			pcs_horny += rand(3, 6)
+			'You shove your whole hand inside your tight pussy, feeling your pussy grip it tightly.'
 		else
-			act 'Stop touching yourself':gt 'selfplay', 'stop'
+			pcs_horny += rand(6, 12)
+			'You stick your whole hand in your pussy, and feel how your vagina envelops it nicely. You get a pleasant feeling of fullness.'
 		end
+		if pcs_vag < 20:vaginaTemp += 1
+
+		gs 'arousal', 'self_fisting', 2, 'masturbate'
+		gs 'stat'
+
+		'<<$AnyaMsg>>'
+
+		if org_temp = orgasm: gs 'selfplay', 'self_fisting_2'
 	end
+end
 
-	act 'Stop touching yourself':gt 'selfplay', 'stop'
+if $ARGS[0] = 'self_fisting_2':
+	act 'Fuck your fist':
+		cls
+		selfplaytime += 10
+		gs 'selfplay', 'sis_prov'
+
+		if pcs_vag < 15:
+			if vgape = 2:vgape = 3
+			if vgape = 1:vgape = 2
+			if vgape = 0:vgape = 1
+
+			pcs_horny -= 10
+			pcs_mood -= 10
+		end
+
+		'<center><img <<$set_imgh>> src="images/shared/sex/mast/self_fisting.jpg"></center>'
+		if args[1] = 1:
+			'You continue to move your arm, thrusting your hand into your pussy again and again.'
+		else
+			'You start to slowly move your arm, thrusting your hand into your pussy again and again.'
+		end
+
+		gs 'arousal', 'self_fisting', 10, 'masturbate'
+		gs 'stat'
+
+		if pcs_vag <= 20:pcs_horny -= 10 & pcs_mood -= 10 & 'You''re stretching your pussy to the point where it becomes rather painful, and don''t get any enjoyment out of it.'
+		if pcs_vag > 15:pcs_horny += rand(10, 20) & 'Your pussy walls are stretched nicely from the the fisting, and you feel a pleasant warmth spread in your lower body.'
+
+		gs 'stat'
+
+		if pcs_vag < 25:vaginaTemp += 1
+
+		'<<$AnyaMsg>>'
+
+		if org_temp = orgasm: gs 'selfplay', 'self_fisting_2', 1
+
+		act 'Stop touching yourself':gt 'selfplay', 'stop'
+	end
 end
 
 if $ARGS[0] = 'anal_fingering':