Browse Source

Merge remote-tracking branch 'origin/master'

Kevin_Smarts 9 months ago
parent
commit
9ae43f403d

+ 7 - 7
locations/food_menu.qsrc

@@ -441,19 +441,19 @@ elseif $loc = 'uni_cafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
-	$_eat['0,type'] = 'only_cost_pirosh'
+	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'only_cost_bliny'
+	$_eat['1,type'] = 'bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
-	$_eat['2,type'] = 'only_cost_golub'
+	$_eat['2,type'] = 'golub'
 	$_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
-	$_eat['3,type'] = 'only_cost_pozhar'
+	$_eat['3,type'] = 'pozhar'
 	$_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
-	$_eat['4,type'] = 'only_cost_reuben'
+	$_eat['4,type'] = 'reuben'
 	$_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
@@ -466,10 +466,10 @@ elseif $loc = 'uni_cafe':
 	$_drink['2,type'] = 'only_cost_jui'
 	$_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['0,type'] = 'only_cost_tea'
+	$_drink['3,type'] = 'only_cost_tea'
 	$_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
-	$_drink['2,type'] = 'only_cost_bco'
+	$_drink['4,type'] = 'only_cost_bco'
 	$_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'only_cost_mil'

+ 155 - 3
locations/katja_nightclub.qsrc

@@ -296,8 +296,15 @@ if $ARGS[0] = 'dance':
 		if katjaQW['drinks'] > 6:
 			iif(alko > 6, 'You and Katja are', 'Katja is')+' having some issues with not bumping into other dancers, not that they seem to be paying any notion to it.'
 		end
-	elseif temp_rand = 2:
+	elseif temp_rand <= hotcat/2:
 		gt 'katja_nightclub', 'dance_guy1'
+	elseif temp_rand = 11 and func('katja_procedural', 'willing_to_be_naughty') > 30*(2 -npc_sex['A14']):
+		katjaQW['horny'] += 5
+		gs 'arousal', 'foreplay', -5
+		gs 'arousal', 'end'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_grinding.jpg"></center>'
+		'As you are dancing then Katja turns around and starts doing quite sex sexy dance moves in front of you. As the rhythm allows it she starts to grind be butt into you.'
+		'When the number is over she turns around and dance normally for the next number but with a naughty glint in her eye.'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dancing1.jpg"></center>'
 		if katjaQW['drinks'] < 4:
@@ -491,7 +498,7 @@ if $ARGS[0] = 'bar_after_drink':
 		end
 		katjaQW['disco_drink_bought'] = 0
 		gs 'katja_nightclub', 'bar_end'
-	elseif temp_rand = 2:
+	elseif temp_rand <= hotcat/2:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_dringking_man_approach.jpg"></center>'
 		'As '+iif(katjaQW['disco_drink_bought'] = 1, 'you and Katja are', 'Katja is')+' drinking '+iif(katjaQW['disco_drink_bought'] = 1, 'your', 'her')+' drink, a well-dressed man comes up to you. "Hello, ladies! Mind if I join you?"'
 		katjaQW['disco_drink_bought'] = 0
@@ -939,6 +946,7 @@ if $ARGS[0] = 'dance_guy1':
 	'A guy approaches you and Katja and it''s clear that he wants to join you two dancing. He''s rather good looking and wearing nice clothes.'
 	act 'Let him join you': gt 'katja_nightclub', 'dance_guy2'
 	act 'Don''t let him join':
+		cla
 		'You make sure to let him know that you don''t want him to join your dance, and you and Katja continue dancing alone having a lot of fun.'
 		gs 'katja_nightclub', 'dance_end'
 	end
@@ -1025,6 +1033,7 @@ if $ARGS[0] = 'dance_guy3':
 								act 'Leave': gt 'city_nightclub', 'private_rooms'
 							end
 							act 'Stay with Katja':
+								cla
 								'"I''m sorry, but my friend just reminded me that we need to be somewhere else. I hope you understand," you tell him. He looks disappointed but leaves the two of you alone.'
 								'"Thanks. I really didn''t want to have a guy hitting on us right now," Katja says.'
 								gs 'katja_nightclub', 'dance_end'
@@ -1092,6 +1101,7 @@ if $ARGS[0] = 'dance_guy3':
 								end
 							end
 						else
+							cla
 							'"Thanks, but no thanks. I think we''ll stick to dancing," you tell him.'
 							'"We had fun, though. Maybe some other time?" Katja says. He then leaves you, looking a little down.'
 							gs 'katja_nightclub', 'dance_end'
@@ -1291,7 +1301,7 @@ if $ARGS[0] = 'private_room1':
 			'<<$npc_nickname[$npclastgenerated]>> looks confused. "What was that about?" he asks.'
 			'"My friend has had an addiction problem. She''s over it now, but tries to avoid drugs because of that," you explain. "I''m very sorry, but I need to check up on my friend," you say and leave <<$npc_nickname[$npclastgenerated]>>.'
 			act 'Find Katja':
-				*clr & cla	
+				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
@@ -1699,5 +1709,147 @@ if $ARGS[0] = 'private_room2':
 	end
 end
 
+if $ARGS = 'lone_bartender':
+	menu_off = 1
+	minut += 5
+	katjaQW['lone_bartender'] = daystart 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_talking_on__dance_floor.jpg"></center>'
+	'"Let'' go to one of the small bars upstairs. There are usually not that many people," Katja says, and you agree and follow her upstairs.'
+	'There you quickly find a bar that is actually empty except for the bartender. As you are about to enter Katja suddenly stops.'
+	'"I'' sorry, really need to powder my nose. Just go ahead, and start ordering" I will be back in just a minute, and before you can say anything, she'' gone.'
+	act 'Go to the bartender':
+		*clr & cla
+		minut += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
+		'You approach the bar, where a rather handsome bartender looks like he is doing some cleaning.'
+		'"I''m sorry, but we are closed. You''ll have to find another bar." He says, just as you reach the bar.'
+		act 'Leave and wait for Katja outside':
+			*clr & cla
+			minut += 7
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+			'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+			act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+		end
+		act 'Try to convince him to stay open':
+			*clr & cla
+			minut += 1
+			gs 'exp_gain', 'persuas', rand(0,1)
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/hot_bartender.jpg"></center>'
+			'"Why don''t you stay open for my cute friend and me, handsome? It will just be one drink. I promise we won''t make any mess." You say, trying to make the best doe eyes you can.'
+			if pcs_persuas >= rand(50,100):
+				'It looks like he is seriously considering staying open for you. You think that pushing a little more will convince him.'
+				if hotcat > 8:
+					gs 'willpower', 'misc', 'force', 'easy'
+				elseif hotcat > 5:
+					gs 'willpower', 'misc', 'force'
+				else
+					gs 'willpower', 'misc', 'force', 'hard'
+				end
+				if will_cost <= pcs_willpwr:
+					act 'Convince the bartender to serve you (<<will_cost>> Willpower)':
+						*clr & cla
+						if hotcat > 8:
+							gs 'willpower', 'misc', 'force', 'easy'
+						elseif hotcat > 5:
+							gs 'willpower', 'misc', 'force'
+						else
+							gs 'willpower', 'misc', 'force', 'hard'
+						end						
+						gs 'willpower', 'pay', 'force'		
+						gs 'stat'
+						
+						'"Come on, please. It will just be me and my friend". We won''t be a bother. We''ll just have a quick drink. You would be the best bartender ever if you did." You continue.'
+						'He finally relents. "Okay. Just one drink and only you and your friend. No others. So what will you have?" he asks.'
+						$loc = 'katja_nightclub'
+						$loc_arg = 'lonebartender_drinking'
+						gs 'food_menu', 'city_nightclub_only_cost'
+					end
+				else
+					act 'Convince  the bartender to serve you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'					
+				end
+			else
+				'It does''nt seem like your charm alone will convince him.'
+			end
+			if hotcat > 7:
+				'He''s clearly having a hard time taking his eyes off your hot body, and you can see how flustered he''s getting from your flirting.'
+				'You are sure that giving him a blow job would convince him to stay open, and he is quite good looking.' 
+				gs 'willpower', 'bj', 'self', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Give him a blow job (<<will_cost>> Willpower)':
+						cla
+						if katjaQW['faithful'] = 1 and katjaQW['couple'] =1:
+							'As you are considering to give him a blow job, you remember that you promised Katja that you would be faithful.'
+							'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+							act 'Risk it':
+								gs 'willpower', 'pay', 'self'
+								gt 'katja_nightclub_sex', 'bartender_bj' 
+							end
+						else
+							if KatjaQW['boy_block'] = 1:
+								'As you are considering giving him a blowjob, you remember you told Katja that you are not into boys. She will definitely be surprised if she catches you with his dick in your mouth.'
+								'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+								act 'Risk it':
+									gs 'willpower', 'pay', 'self'
+									gt 'katja_nightclub_sex', 'bartender_bj' 
+								end
+							else
+								if katjaQW['knows_BJ'] = 0:
+									'As you are considering giving him a blowjob, you don''t think that Katja even knows you are giving boys blowjobs. You wonder how surprised she will be if she sees his dick in your mouth.'
+									'Maybe if you are quick, he will come before she finishes powdering her nose, but do you risk it?'
+									act 'Give him the blow job':
+										gs 'willpower', 'pay', 'self'
+										gt 'katja_nightclub_sex', 'bartender_bj' 
+									end
+								else							
+									gs 'willpower', 'pay', 'self'
+									gt 'katja_nightclub_sex', 'bartender_bj' 
+								end
+							end
+						end
+						act 'Don''t give him the blow job':
+							*clr & cla
+							minut += 5
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+							'You change your mind and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+							act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+						end						
+					end
+				else
+					act 'Give him a blow job(<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 'Leave and wait for Katja outside':
+				*clr & cla
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+				'You accept that the place is closed and go outside, waiting for a while before Katja appears. You tell her the bar is closed, and you both walk towards the main bar.'
+				act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+			end			
+		end
+	end
+end
+
+if $ARGS[0] = 'lonebartender_drinking':
+	$loc = 'city_nightclub'
+	$loc_arg = 'bar'
+	$menu_loc = 'city_nightclub'
+	$menu_arg = 'bar'
+	menu_off = 1
+	minut += 15
+	gs 'stat'
+	katjaQW['drinks'] += rand(1,2)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
+	'Katja arrives as he is about to serve your order, and you quickly whisper to her that she should be quick and very kind to the bartender.'
+	'She does as you say and places her order immediately when he serves yours, and soon you both have your drinks talking until they are finished.'
+	'You thank the bartender again and heads back to the dance floor.'
+	act 'Go dancing': gt 'katja_nightclub', 'dance'
+end
+
 --- katja_nightclub ---------------------------------
 

+ 447 - 1
locations/katja_nightclub_sex.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'private_booth_FFM':
 	'So you just go for it and start sucking on her left tit. She starts moaning loudly and <<$npc_nickname[$npclastgenerated]>> looks on intently.'
 	gs 'stat'
 	act 'Start licking her pussy':
-		*clr & cla	
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/one_guy_private2.jpg"></center>'
 		'You gently lay Katja down and start licking her now very wet pussy. She moans and <<$npc_nickname[$npclastgenerated]>> can''t hold back anymore and starts sucking on her luscious breast.'
 		gs 'arousal', 'cuni_give', 3, 'group', 'lesbian'
@@ -183,5 +183,451 @@ if $ARGS[0] = 'private_booth_FFM':
 	end
 end
 
+if $ARGS[0] =  'bartender_bj': 
+	menu_off = 1
+	gs 'npcgeneratec', 0, 'Bartender', rand(18,38), rand(2,3)
+	gs 'boystat', $npclastgenerated
+	minut += 2 
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj1.jpg"></center>'
+	'You move behind the bar, walking as seductively as possible, and he stops what he''s doing and just stares at your '+iif( pcs_butt > pcs_cupsize, ' <<pc_desc[''butt'']>> butt', '<<pc_desc[''breast'']>> tits')+' stammering, "What... are you doing?"'
+	'"I''ve seen the way you look at my hot body, and I think I know how to compensate you adequately for staying open for me and my friend," you say as you are swaying sensuously in front of him.'
+	'"H-How..." he asks, stuttering.'
+	'You get down on your knees and move your hands towards his pants, which are barely hiding his now very hard dick. "I think that you want these <<$pc_desc[''lip size'']>> lips around your cock," you say, licking your lips.'
+	'"Yes... oh yes," he says.'
+	act 'Suck his cock':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
+		'You open his pants and pull out his <<$dick_girth>>, <<dick>>cm cock, make sure your mouth is wet, and then '+iif(dick > pcs_throat, 'take it in your mouth with some problems', 'swallow it like a pro')+'.'
+		'You suck his dick with all the skill you''ve got, and he clearly likes it.'
+		gs 'arousal', 'bj', 3
+		gs 'stat'
+		act 'Try to get him off before Katja returns':
+			if npc_sex_stamina[$npclastgenerated] <= rand(min(stat['bj']/100,5),min(stat['bj']/25+3,10)):
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
+				'You prove skilled enough to get him off in a few minutes. Soon, he comes in your mouth and you swallow his cum, so you don''t leave traces for Katja to notice.'
+				gs 'arousal', 'bj', 3
+				gs 'arousal', 'end'
+				gs 'cum_call', 'mouth_swallow', $boy, 0
+				gs 'stat'
+				'You manage to just get back to the other side of the bar, and the bartender gets his pants zipped back up, when Katja comes back.'
+				'"Have you already ordered?" she asks.'
+				'"No, I was just about to," you say. "The bartender needed a little convincing to keep open for us," you say, subtly winking at the man.'
+				$loc = 'katja_nightclub_sex'
+				$loc_arg = 'lonebartender_drinking1'
+				gs 'food_menu', 'city_nightclub_only_cost'
+			else
+				gt 'katja_nightclub_sex', 'bartender_bj_katja'
+			end
+		end
+		act 'Take your time': 
+			gt 'katja_nightclub_sex', 'bartender_bj_katja'
+		end
+	end
+end
+
+if $ARGS[0] = 'bartender_bj_katja':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj3.jpg"></center>'
+	'You suck the bartender''s cock with all the skill you have, and he seems to like it.' 
+	gs 'arousal', 'bj', 3
+	if katjaQW['faithful'] = 1 and katjaQW['couple'] =1:
+		gs 'arousal', 'end'
+		gs 'npc_relationship', 'modify', 'A14', 'loathe'
+		gs 'stat'
+		'"What the fuck, <<$pcs_nickname>>!" you suddenly hear somebody shouting from behind. You let go of the bartender''s dick and turn to see a furious Katja.'
+		if katjaQW['cheat_warning'] > 0:
+			katjaQW['cheat_times'] += 1
+			'"You promised that you would not cheat on me again. You lying bitch!" Katja yells before storming off.'
+		else
+			'"Why is his dick in your mouth? It''s supposed to be just the two of us," Katja says before storming off.'
+		end
+		'You look at the bartender, who''s already stuffing his dick away. Clearly, he doesn''t want to be part of a lovers'' spat.'
+		act 'Follow Katja': gt 'katja_nightclub_sex', 'cheating_conversation', 'bartender'
+	else
+		if katjaQW['boy_block'] = 1:
+			gs 'npc_relationship', 'modify', 'A14', 'hate'
+			gs 'stat'
+			'"<<$pcs_nickname>>!" you suddenly hear somebody shouting from behind. You let go of the bartender''s dick and turn to see a shocked Katja.'
+			'"Why is his dick in your mouth? You told me you didn''t like boys," Katja says, sounding very surprised but also a little disappointed.'
+			act 'You''re only doing it to keep the bar open':
+				'"I haven''t changed my mind. I''m just doing this so he will keep the bar open for us," you tell Katja. "I don''t like it."'
+				'"What the fuck? You''re gay!?" the bartender shouts, surprised. "I thought you liked me! But you''re just playing me like the cheep whore you are. Get out!" he continues.'
+				'"I was just..." you start but get interrupted by him yelling.'
+				'"Get out, you lesbian freak! Get out!" You can see he is getting really angry.'
+				act 'Leave fast':
+					*clr & cla
+					minut += 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/private_booths_walkway.jpg"></center>'
+					'You get up from your knees and almost run after Katja, who''s already left the bar. Out on the first floor platform, you stop.'
+					'"That went well. I can see why you said you don''t like boys. But that was stupid of you to start something like trying to give him a blowjob," Katja says. "Let''s go to the main bar".' 
+					act 'Go to the main bar':  gt 'katja_nightclub', 'bar_arrive'
+				end
+			end
+			act 'Tell Katja that you have changed your mind about boys':
+				katjaQW['boy_block'] = 0
+				if katjaQW['knows_BJ'] = 0: katjaQW['knows_BJ'] = 1
+				if stat['bj'] = 0:
+					'"Well, the bartender looked hot, so I decided to see what it''s like sucking on a dick. It''s nice so far. You''re welcome to watch me try," you tell the redhead.'
+				else
+					'"I''ve changed my mind. Some guys like this bartender are actually quite hot, and sucking dick is not that bad. You''re welcome to watch me try," you tell the redhead.'
+				end
+				'"You could''ve told me," Katja says, clearly sounding like you have let her down.'
+				'"I''m sorry, I should have," you offer, sounding as remorseful as you can.' 
+				'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
+				katjaQW['slut'] += rand(1,2)
+				act 'Get him off': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
+			end
+		else
+			if katjaQW['knows_BJ'] = 0:
+				katjaQW['knows_BJ'] = 1
+				'"Wow! What are you doing, <<$pcs_nickname>>!" you suddenly hear somebody shouting from behind. You let go of the bartender''s dick and turn to see a surprised Katja.'
+				'"You''re sucking that guy''s dick out in the open. I didn''t know you were such a slut," she continues, sounding '+iif(func('katja_procedural', 'willing_to_be_naughty') > 30, 'quite', 'a little')+' excited.'
+				'"I''m just showing how grateful we are for keeping the bar open for us. You''re welcome to watch; you might learn something," you answer, and turn back to his cock.'
+				'"You are such a slut," Katja replies.'
+				'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
+				katjaQW['slut'] += 5
+				act 'Get him off': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
+			else
+				if katjaQW['QWstage'] < 6 or katjaQW['sex_clossedness'] = 2:
+					'"What are you doing, <<$pcs_nickname>>! You can''t do that here," you suddenly hear somebody shouting from behind. You let go of the bartender''s dick and turn to see a surprised Katja.'
+					'"I''m just showing how grateful we are for keeping the bar open for us. You''re welcome to watch; you might learn something," you answer, before turning back to his cock.'
+					'"You are such a slut," Katja replies.'
+					'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
+					katjaQW['slut'] += rand(1,2)
+					act 'Get him off': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
+				else
+					if func('katja_procedural', 'willing_to_be_naughty') + katjaQW['horny'] > 125 and katjaQW['sex_clossedness'] = 0:
+						'"I should have known, <<$pcs_nickname>>! I can''t leave you alone for two minutes before you''re on your knees with a cock down your throat," you suddenly hear somebody shouting from behind.' 
+						'You let go of the bartender''s dick and turn to see a grinning Katja. "You are such a slut. <<$pcs_nickname>>, I don''t know what to do with you," she continues, shaking her head.'
+						'"I''m just showing how grateful we are for keeping the bar open for us. You''re welcome to watch, or join," you answer, before turning back to his cock.'
+						'"You are such a slut," Katja replies.'
+						'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
+						act 'Get him off': gt 'katja_nightclub_sex', 'bartender_bj_katja_join'
+					else
+						'"What are you doing, <<$pcs_nickname>>! I didn''t know you were planning to have sex with the bartender!" you suddenly hear somebody shouting from behind.'
+						'You let go of the bartender''s dick and turn to see a mildly surprised Katja. "You''re such a slut. <<$pcs_nickname>>, I don''t know what to do with you," she continues, shaking her head.'
+						'"I''m just showing how grateful we are for keeping the bar open for us. You''re welcome to watch, or join," you answer, before turning back to his cock.'
+						'"You are such a slut," Katja replies.'
+						'"Hey, why don''t you close the door, so that others don''t disturb us?" the bartender asks Katja, and you can hear that she does.'
+						act 'Get him of': gt 'katja_nightclub_sex', 'bartender_bj_katja_watch'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'bartender_bj_katja_watch':
+	if katjaQW['slut'] < 30:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
+		'You take his cock in your mouth once more. You don''t hear Katja come back, and increase your effort to get him off.'
+		'After a few minutes, he comes in your mouth, and you swallow it so you don''t get anything on your dress.'
+		gs 'arousal', 'bj', 3
+		gs 'arousal', 'end'
+		gs 'cum_call', 'mouth_swallow', $boy, 0
+		gs 'stat'
+		*nl
+		'As you get up, you see that Katja is sitting in one of the couches near the bar. Apparently, she didn''t want to watch you give a blowjob.'
+		'"I''m done now, you can come and order your drink," you call to Katja as you move on the other side of the bar. She gets up and joins you while you order your drink.'
+	elseif katjaQW['slut'] < 50:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
+		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show Katja how it''s done.'
+		'You look back at Katja from time to time and notice she is sitting with big, open eyes watching you.'
+		'After a few minutes, he comes in your mouth, and you swallow it so you don''t get anything on your dress.'
+		gs 'arousal', 'bj', 3
+		gs 'arousal', 'end'
+		gs 'cum_call', 'mouth_swallow', $boy, 0
+		katjaQW['slur'] += rand(1,2)
+		katjaQW['horny'] += rand(5,20)
+		gs 'stat'
+		*nl
+		'As you get up, you see that Katja''s face has gotten very red, but she doesn''t say anything.'
+		if katjaQw['QWstage'] < 5 and katjaQW['simultanous_boys'] = 0:
+			'"That''s how it''s done; next time, you can do it," you tell Katja.'
+			'"No way, I couldn''t do that," she says quickly, but doesn''t sound very convincing.'
+		end
+		'You move to the other side of the bar, and as soon as you sit down next to her, Katja starts to ask questions about it. While trying to entertain her, you order your drinks.'
+	elseif katjaQW['slut'] < 80:
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj2.jpg"></center>'
+		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show Katja how it''s done.'
+		'You look back at her from time to time and notice that she''s sitting there, watching you and clearly getting more and more aroused.'
+		'After a few minutes, he comes in your mouth, and you swallow it so you don''t get anything on your dress.'
+		gs 'arousal', 'bj', 3
+		gs 'arousal', 'end'
+		gs 'cum_call', 'mouth_swallow', $boy, 0
+		katjaQW['horny'] += rand(10,20)
+		gs 'stat'
+		*nl
+		'As you get up, Katja immediately asks you, "How was it? Was it a nice cock? Did his cum taste okay?"' 
+		'"Slow down, Katja," you say as you move to the other side of the bar. After you sit down next to her, you start answering her questions. While trying to entertain her, you order your drinks.'	
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj3.jpg"></center>'
+		'You take his cock in your mouth once more. You hear Katja come back, and increase your effort to get him off to show to Katja how it''s done.'
+		'Katja starts cheering you on, tossing out one lewd comment after another while you blow the guy.'
+		'After a few minutes, he comes in your mouth, and you swallow it to Katja''s delight.'
+		gs 'arousal', 'bj', 3
+		gs 'arousal', 'end'
+		gs 'cum_call', 'mouth_swallow', $boy, 0
+		katjaQW['horny'] += rand(10,20)
+		gs 'stat'
+		*nl
+		'As you get up Katja says, "There you go, girl. What a complete slut you are. Was it any good?" She has a wide smile on her face, clearly approving of your work.'
+		'You move to the other side of the bar and, as you sit down next to her, you start answering her questions. While trying to entertain her, you order your drink.'
+	end
+	$loc = 'katja_nightclub_sex'
+	$loc_arg = 'lonebartender_drinking1'
+	gs 'food_menu', 'city_nightclub_only_cost'
+end
+
+if $ARGS[0] = 'bartender_bj_katja_join':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_bj4.jpg"></center>'
+	'You take his cock in your mouth once more. You hear Katja come over to you and get down next to you.'
+	'"Let me help with that," she says and you hold out the bartender''s dick for her and she starts licking it.'
+	'You share his dick for a couple of minutes, taking turns sucking on it.'
+	gs 'arousal', 'bj', 3
+	act 'Get him off with your mouths':
+		if rand(1,10) < min(katjaQW['slut']/20,5) and npc_throat['A14'] > dick:
+			'You and Katja do a good job, and soon he cums down Katja''s throat. She swallows everything, like a pro.'
+		else
+			'You and Katja do a good job, and soon he cums down your throat. Katja tells you to swallow everything, which you do.'			
+			gs 'cum_call', 'mouth_swallow', $boy, 0
+		end
+		gs 'arousal', 'end'
+		katjaQW['horny'] += rand(10,20)
+		gs 'stat'
+		*nl
+		'As the two of you get up, Katja says, "There you go, girl. What a perfect pair of sluts we are," and then bursts out with laughter over what she just said.'
+		'You move to the other side of the bar and order your drinks.'	
+	end
+	act 'Fuck him': gt 'katja_nightclub_sex', 'bartender_sex1'
+end
+
+if $ARGS[0] = 'bartender_sex1':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex1.jpg"></center>'
+	'"Enough sucking. I want that dick in my pussy," you say as you stand up. You '+iif($pantyworntype ! 'none', ' pull down you panties and ', ' ')+'lift up your dress before bending over.'
+	'Katja jumps onto the bar so her smooth pussy is just in front of your mouth.'
+	'You start to lick it, just as the bartender jams his <<$dick>>cm, <<$dick_girth>> cock into your pussy.'
+	gs 'arousal', 'vaginal', 3, 'group'
+	gs 'arousal', 'cuni_give', -3, 'group', 'lesbian'
+	katjaQw['horny'] += rand(5,15)
+	gs 'stat'
+	act 'Katja wants some dick too':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex2.jpg"></center>'
+		'After you have been fucked for a couple of minutes, Katja Says, "I want some of that dick, too."'
+		'You remove your mouth from her pussy, "Okay."'
+		'The bartender pulls out of you and says, "Since the door is closed, we won''t be disturbed, so let''s move to one of the couches to get more comfortable."'
+		'He sits down on with his <<$dick>>cm, <<$dick_girth>> cock standing straight up. Katja is quick to jump on to it, moaning, '+iif(dick > npc_vag['A14'], '"Ahh..."', '"Hrunf!" clearly having a little trouble taking his size.')
+		'You then get on the back of the couch and present your pussy to the redhead, who hungrily starts eating you out as she rides his cock.'
+		minut += 2
+		katjaQW['slut'] += rand(0,3)
+		katjaQw['horny'] += rand(5,20)
+		gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+		gs 'stat'
+		act 'Change again':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex3.jpg"></center>'
+			'"I need a break," Katja says after riding him for a few minutes. She gets off his cock, which is still standing up, very hard and straight.'
+			'You take that as an invitation and crawl onto it, reverse cowgirl, and place your feet on his thighs. He puts his hands under you butt, and helps you move up and down on his cock.'
+			'Katja gets in real close to you, watching you move on his dick while fingering herself.'
+			katjaQw['horny'] += rand(0,5)
+			gs 'arousal', 'vaginal', 3, 'group', 'lesbian'
+			gs 'stat'
+			act 'Katja''s turn again':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex4.jpg"></center>'
+				'After a few minutes in this position, it''s clear that this is very exhausting on the bartender''s arms, you get less and less help from him, and he says, "Time to change positions again."'
+				'You get off his cock, and he lies down on his side on the couch. "Let me have some," Katja pleads and you let her get down in spoon position with the bartender.'
+				'He then guides his cock into Katja and starts fucking her while you play with her clit.'
+				katjaQw['horny'] += rand(5,15)
+				gs 'arousal', 'vaginal_finger_give', 3, 'group', 'lesbian'
+				gs 'stat'
+				act 'Katja gets pounded':
+					*clr & cla
+					if katjaQW['horny'] >= 100:
+						katjaQW['horny'] = 0
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex5a.jpg"></center>'
+						'The bartender gets impatient with the soft fucking, and suddenly turns Katja over on her stomach and starts pounding her hard from behind.'
+						'Her mouth is now near your pussy, and she starts to lick it. But it doesn''t last long before she stops and comes hard and loud.'
+					else
+						katjaQw['horny'] += rand(5,20)
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex5b.jpg"></center>'
+						'The bartender gets impatient with the soft fucking, and suddenly turns Katja over on her stomach and starts pounding her hard from behind.'
+						'Her mouth is now near your pussy, and she starts to lick it with all the skill she has.'
+					end
+					gs 'arousal', 'cuni', 3, 'group', 'lesbian'
+					gs 'stat'
+					act 'Your turn to get pounded':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex6.jpg"></center>'
+						'"Ok, before I come, I need to try your pussy again. Get up on the couch and put your ass in the air," the bartender tells you as he pulls out of a'+iif(katjaQW['horny'] = 0, 'satisfied', 'annoyed')+' looking Katja.'
+						'You do as he says and he starts pounding you as hard as he can, while he put his fingers in Katja''s mouth to suck on.'
+						gs 'arousal', 'vaginal', 3, 'group'
+						gs 'stat'
+						act 'Katja gets a facial':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_sex7.jpg"></center>'
+							gs 'arousal', 'end'
+							minut += 2
+							gs 'stat'
+							'"I''m cumming!" the bartender screams as he pulls out of you, and starts to spray his sperm over Katja''s face.'
+							'By the time you have gotten turned around, he''s finished, and Katja''s face has a thick layer of cum around her mouth.'
+							act 'Get dressed':
+								*clr & cla
+								minut += 5
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/sex/bartender_after_sex.jpg"></center>'				
+								'"That was great, girls. You definitely deserve to have a drink now," he says, as he starts to get dressed again.'
+								'You start by helping Katja get her face cleaned up. She says, '+iif(katjaQW['slut'] > 100, '"What a complete pair of sluts we are - getting banged just to be able to have a drink like some cheap whores."', '"Wow. I don''t know to to say. I feel so dirty, but in a good way..."')
+								'She then starts laughing. By the time you have finished dressing, she has come down, and you walk to the bar, where the bartender is already waiting to serve you.'
+								*nl
+								'"After that wonderful, but exhausting experience, I think you should start with this," he says and hands you a pair of bottles of water. "What else would you like?"'
+								$loc = 'katja_nightclub_sex'
+								$loc_arg = 'lonebartender_drinking2'
+								gs 'food_menu', 'city_nightclub_only_cost'
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'lonebartender_drinking1':
+	$loc = 'city_nightclub'
+	$loc_arg = 'bar'
+	$menu_loc = 'city_nightclub'
+	$menu_arg = 'bar'
+	menu_off = 1
+	minut += 15
+	gs 'stat'
+	katjaQW['drinks'] += rand(1,2)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
+	'Katja also orders her drink, and soon you both have your drinks, talking until they are finished. The whole time, the bartender tries to avoid looking either of you in the eyes.'
+	'You thank the bartender again, which makes him completely red in the face and head back to the dance floor.'
+	act 'Go dancing': gt 'katja_nightclub', 'dance'
+end
+
+if $ARGS[0] = 'lonebartender_drinking2':
+	$loc = 'city_nightclub'
+	$loc_arg = 'bar'
+	$menu_loc = 'city_nightclub'
+	$menu_arg = 'bar'
+	menu_off = 1
+	minut += 15
+	gs 'stat'
+	katjaQW['drinks'] += rand(1,2)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/nightclub/disco_drinnking_bar.jpg"></center>'
+	'Katja also orders her drink, and soon you both have your drinks talking. The bartender, on occasion, joins the conversation and you have a great time.'
+	'You both thank him with kisses on his cheek when you have finished your drinks and head back to the dance floor.'
+	act 'Go dancing': gt 'katja_nightclub', 'dance'
+end
+
+if $ARGS[0] = 'cheating_conversation':
+	minut += 10
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'You get out to the platform overlooking the dance floor, and see Katja standing there. As you approach her, you can see her fuming.'
+	if katjaQW['cheat_warning'] = 0:
+		katjaQW['cheat_warning'] = 1
+		'"How could you <<$pcs_nickname>>? You said you were my girlfriend, and that it was just going to be the two of us," Katja says with tears coming out of her eyes.'
+		if $ARGS[1] = 'bartender':
+			'"It wasn''t anything sexual. I just needed to do something to keep the bar open for us. There were no feelings in it from me. Only acting," you try to explain.'
+			if pcs_persuas >= rand(50+katjaQW['dom'],100):
+				gs 'exp_gain', 'persuas', rand(3,6)
+				'"And that''s supposed to make me feel better? That you would have sex with people like a machine? Are you like that with me?" Katja says, still crying.'
+				'"Of course not. With you, it''s different since I love you. I don''t love anybody else the way I love you," you say.'
+				*nl
+				'Katja just stands there for a moment, but her crying subsides. "You betrayed me. I need to think about it. I need to be alone," Katja says and turns around, walking towards the exit.'
+			else
+				gs 'exp_gain', 'persuas', rand(1,2)
+				gs 'npc_relationship', 'modify', 'A14', 'hate'
+				'"So you are just a cheep whore? That doesn''t make it better! How many others have you done it with behind my back?" Katja says, still crying but it seems to be more out of anger now.'
+				'"No one. This is the only time. I promise that it will never happen again," you say, trying to calm her down.'
+				'"I don''t know if I can trust you. Why did I fall in love with such a slut? I need to be alone," Katja says and turns around, walking towards the exit without giving you time to say anything else.'
+			end
+		else
+			'"It wasn''t anything sexual. No emotions, just me going through some motions to keep them happy. Only acting," you try to explain.'
+			if pcs_persuas >= rand(50+katjaQW['dom'],100):
+				gs 'exp_gain', 'persuas', rand(3,6)
+				'"And that''s supposed to make me feel better? That you would have sex with people like a machine? Are you like that with me?" Katja says, still crying.'
+				'"Of course not. With you, it''s different since I love you. I don''t love anybody else the way I love you," you say.'
+				*nl
+				'Katja just stands there for a moment, but her crying subsides. "You betrayed me. I need to think about it. I need to be alone," Katja says and turns around, walking towards the exit.'
+			else
+				gs 'exp_gain', 'persuas', rand(1,2)
+				gs 'npc_relationship', 'modify', 'A14', 'hate'
+				'"So you have sex with people without emotions? That doesn''t make it better! How many others have you done it with behind my back?" Katja says, still crying but it seems to be more out of anger now.'
+				'"No one. This is the only time. I promise that it will never happen again," you say, trying to calm her down.'
+				'"I don''t know if I can trust you. Why did I fall in love with such a slut? I need to be alone," Katja says and turns around, walking towards the exit without giving you time to say anything else.'		
+			end
+		end
+		if hour > 10:
+			locat['katja_rand2'] = daystart
+		else
+			locat['katja_rand2'] = daystart -1
+		end
+		locat['katja_save2'] = 20
+		locat['katja'] = locat['katja_save2']
+		gs 'stat'
+		act 'Let her leave': gt 'city_nightclub', 'private_rooms'
+	else
+		'"Again! You keep cheating on me, <<$pcs_nickname>>. How can I ever trust you again?" Katja says, clearly angry.'
+		if $ARGS[1] = 'bartender':
+			'"It wasn''t anything sexual. I just needed to do something to keep the bar open for us. There were no feelings in it from me. Only acting," you try to explain.'
+		else
+			'"It wasn''t anything sexual. No emotions, just me going through some motions to keep them happy. Only acting," you try to explain.'
+		end
+		'"I don''t want your excuses. I want you to stop betraying my trust," Katja says.'
+		if pcs_persuas >= rand(50+katjaQW['dom'],100):
+			gs 'exp_gain', 'persuas', rand(1,2)
+			gs 'willpower', 'misc', 'force'
+		else
+			gs 'exp_gain', 'persuas', rand(0,1)
+			gs 'willpower', 'misc', 'force', 'hard'
+		end
+		if will_cost <= pcs_willpwr:
+			act 'Try to get Katja to accept your apology (<<will_cost>> Willpower)':
+				cla & *clr
+				if katjaQW['cheat_times'] > 0: katjaQW['cheat_times'] -= rand(0,1)
+				gs 'willpower', 'pay', 'force'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				if $ARGS[1] = 'bartender':
+					'"I''m very sorry. I was just trying to get him to keep the bar open for us. The only way I knew, like the cheep Pavlovsk whore I am," you say.'
+					'Your less-than-flattering description of yourself makes Katja laugh. "Don''t betray me again," she says, no longer very angry.'
+					'"But... It''s probably too much to ask. Seeing you are just a cheep whore from Five Eight estate. What shall I ever do with you?" she continue shaking her head, but with a small smile on her face.'
+				else
+					'"I''m very sorry. I acted like the Pavlovsk slut my mother raised me to be. I won''t do it again," you say.'
+					'You less-than-flattering description of yourself makes Katja laugh. "Don''t betray me again," she says, no longer very angry.'
+					'"But... It''s probably to much to ask. Seeing you are just a dumb slut from Five Eight estate. What shall I ever do with you?" she continue shaking her head, but with a small smile on her face.'				
+				end
+				'"Let''s go dance," she continues.'
+				act 'Go dancing': gt 'katja_nightclub', 'dance'
+			end
+		else
+			act 'Try to get Katja to accept your apology (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Let Katja cool off':
+			cla & *clr
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"Calm down, Katja. It was a mistake. I promise it won''t happen again," you say.'
+			'"You betrayed me! Again! I can''t trust you right now. Don''t know if I ever will be able to do it. I''m going home. Don''t follow me," Katja says and turns around, walking towards the exit.'
+			if hour > 10:
+				locat['katja_rand2'] = daystart
+			else
+				locat['katja_rand2'] = daystart -1
+			end
+			locat['katja_save2'] = 20
+			locat['katja'] = locat['katja_save2']
+			gs 'stat'
+			act 'Let her leave': gt 'city_nightclub', 'private_rooms'	
+		end
+	end
+end
+
 --- katja_nightclub_sex ---------------------------------
 

+ 14 - 10
locations/katja_procedural.qsrc

@@ -78,6 +78,8 @@
 !! katjaQW['anal_sex'] = 1 Katja have had anal sex with guy where the player character wasn''t present.
 !! katjaQW['deepthroat'] Number of time Katja have deepthroated
 !! katjaQW['dp'] the number of times Katja have been double penetrated.
+!! katjaQW['creampie'] number of creampies Katja have received
+!!  katjaQW['bondage_sex']  number of times Katja and the player character have had sex where the player character was bound and/or blindfolded.
 
 !! katjaQW['strapon_bj'] = 1 Katja has given a BJ to your strap-on.
 !! katjaQW['strapon_vag'] = 1 You have fucked Katja''s pussy with your strap-on.
@@ -95,12 +97,12 @@
 !! katjaQW['lazar_pussy_talk'] = 1 Katja and the player character have talked about having sex with Lazar.
 !! katjaQW['lazar_anal_talk'] = 1 Katja and the player character have talked about having anal sex with Lazar.
 
-!! katjaQW['Lazar_Ivan_4some'] 1 means the had a foursome but no double penetration, 2 means that the player character recieved a double penetration during the first foursome and have not talked about it yet, and 3 is if the player character have recieved a double penetration and they have talked about the first foursome.
+!! katjaQW['Lazar_Ivan_4some'] 1 means the had a foursome but no double penetration, 2 means that the player character received a double penetration during the first foursome and have not talked about it yet, and 3 is if the player character have received a double penetration and they have talked about the first foursome.
 
 !! katjaQW['Marcus_day'] is set to daystart if you or Katja ask to have a threesome with Marcus. Such that the question will only be asked once per day.
 !! katjaQW['Lazar_day'] is set to daystart if you or Katja ask to have a threesome with Lazar. Such that the question will only be asked once per day.
 
-!! katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective if the player tells her to use it. Should be used to check if Katja can become pregnant by if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure is protected.
+!! katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective if the player tells her to use it. Should be used to check if Katja can become pregnant by if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure she is protected.
 
 !! KatjaQW['orgasm_day'] Is set to be equal to daystart when Katja gain an orgasm (It is not set all places). (KatjaOrgasm)
 !! katjaQW['take_of_panties_day'] is set to daystart if you get katja to take of her panties during school break.
@@ -170,12 +172,13 @@ if $ARGS[0] = 'cikl':
 	end
 	
 	!! Start the countdown for Katja''s relationship talk
-	if yearstart > 1 and npc_sex['A14'] > 0 and katjaQW['relationship_count_start'] = 0: katjaQW['relationship_count_start'] = daystart 
+	if yearstart > 1 and npc_sex['A14'] > 0 and katjaQW['relationship_count_start'] = 0: katjaQW['relationship_count_start'] = daystart
 
 	!! If the player have not gotten to the point where they have sex with Katja by the start of the second year of uni, she will then start to be sexually active without the player. (Does not prevent the player from starting her storyline, but it might be at a later stage in the stroryline, since Katja is now more experienced.
 	if yearstart > 2 and npc_sex['A14'] = 0 and katjaQW['liberated'] = 0:
 		katjaQW['liberated'] = 1
 		katjaQW['slut'] += 20
+		if katjaQW['birth_control_start_day'] = 0: katjaQW['birth_control_start_day'] = daystart
 		if katjaQW['masturbates'] = 0: katjaQW['masturbates'] = 1
 	end
 
@@ -225,7 +228,7 @@ if $ARGS[0] = 'cikl':
 	if katjaQW['coke_stage'] >= 5:
 		if locat['katja_save2'] = 53 and (katjaQW['disco_arrival'] + 600 < totminut or katjaQW['disco_met'] + 600 < totminut):
 			if rand(0,katjaQW['coke_stage']) >= 5: gs 'katja_procedural', 'take_cocaine', 1, 1
-		elseif katjaQw['alone_with_other_day'] = daystart -1
+		elseif katjaQw['alone_with_other_day'] >= daystart -1:
 			if rand(2,katjaQW['coke_stage']) >= 5: gs 'katja_procedural', 'take_cocaine', 1, 1
 		end
 	end
@@ -419,7 +422,7 @@ if $ARGS[0] = 'sex_set':
 					if katjaQW['pussy_sex'] = 0: katjaQW['pussy_sex'] = 1
 					if npc_vag['A14'] < rand(5,10):
 						npc_vag['A14'] += 2
-					elseif npc_vag['A14'] < rand(10,20)
+					elseif npc_vag['A14'] < rand(10,20):
 						 npc_vag['A14'] += 1
 					end
 				else	
@@ -432,7 +435,7 @@ if $ARGS[0] = 'sex_set':
 					if katjaQW['anal_sex'] = 0: katjaQW['anal_sex'] = 1
 					if npc_ass['A14'] < rand(5,10):
 						npc_ass['A14'] += 2
-					elseif npc_ass['A14'] < rand(10,20)
+					elseif npc_ass['A14'] < rand(10,20):
 						 npc_ass['A14'] += 1
 					end
 				else	
@@ -452,15 +455,16 @@ if $ARGS[0] = 'sex_set':
 			!! It this case Katja will have sex with at most 2 of the boys present
 			katjaQW['simultanous_boys'] = rand(1,min(2,ARGS[1]))
 			katjaQW['slut'] += katjaQW['simultanous_boys']*5
-		elseif rand(0,2) <= katjaQW['slut']/50:
+		elseif katjaQW['simultanous_boys'] > 0 and rand(0,2) <= katjaQW['slut']/50:
 			!! Katja have had sex with one or more boys before
 			if npc_vag['A14'] > 0 and rand(0,3) > 0:
 				if katjaQW['pussy_sex'] = 0: katjaQW['pussy_sex'] = 1
 				if npc_vag['A14'] < rand(5,10):
 					npc_vag['A14'] += 2
-				elseif npc_vag['A14'] < rand(10,20)
+				elseif npc_vag['A14'] < rand(10,20):
 					 npc_vag['A14'] += 1
 				end
+				if katjaQW['creampie'] > 0 and rand(0,5) = 0: katjaQW['creampie'] += 1
 			else	
 				if rand(0,5) = 0:
 					npc_vag['A14'] += 2
@@ -471,7 +475,7 @@ if $ARGS[0] = 'sex_set':
 				if katjaQW['anal_sex'] = 0: katjaQW['anal_sex'] = 1
 				if npc_ass['A14'] < rand(5,10):
 					npc_ass['A14'] += 2
-				elseif npc_ass['A14'] < rand(10,20)
+				elseif npc_ass['A14'] < rand(10,20):
 					 npc_ass['A14'] += 1
 				end
 			else	
@@ -518,7 +522,7 @@ if $ARGS[0] = 'sex_set':
 			!! In this case Katja will have sex with at most 3 of the girls present
 			katjaQW['simultanous_girls'] = rand(1,min(3,ARGS[1]))
 			katjaQW['slut'] += katjaQW['simultanous_girls']*4
-		elseif rand(0,1) <= katjaQW['slut']/50:
+		elseif katjaQW['simultanous_girls'] > 0 and rand(0,1) <= katjaQW['slut']/50:
 			!! Katja have had sex with one or more girls before
 			if npc_vag['A14'] > 0 and rand(0,5) > 0:
 				 npc_vag['A14'] += 1

+ 68 - 56
locations/katja_uni.qsrc

@@ -756,70 +756,81 @@ if $ARGS[0] = 'bathroom_katja_panty_remove':
 end
 
 if $ARGS[0] = 'library':
-	cla & *clr
-	menu_off = 1
-	minut += 2
-	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'library'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_alone.jpg"></center>'
-	'You approach Katja, who is clearly studying. She doesn''t notice you until you''re right next to her.'
-	if npc_sex['A14'] >= 1 and katjaQW['sex_clossedness'] < 2:
-		'"Hi <<$pcs_nickname>>," she says with a big smile. She gets up to give you a quick kiss.'
-		'"What''s up?" you say.'
-		'"Just studying for my classes," she says. "I dont''t want to fall behind."'
-	elseif katjaQW['QWstage'] > 0:
-		'"Hi <<$pcs_nickname>>," she says with a big smile and gets up to give you a quick hug before she sits down again.'
-		'"What''s up?" you say.'
-		'"Just studying for my classes," she says. "I dont''t want to fall behind."'
+	if katjaQW['sent_home_from_library_day'] = daystart:
+		cla & *clr
+		menu_off = 1
+		minut += 2
+		gs 'npc_relationship', 'modify', 'A14', 'dislike'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_alone.jpg"></center>'
+		'You approach Katja, who is clearly studying. She notice you and says "I already told you once to go home to sleep until you are better. So go do it".'		
+		act 'Apologize and leave': gt 'uni_library', 'start'	
 	else
-		if fame['city_slut'] > 200:
-			if npc_rel['A14'] >= 50:
-				'"Hi <<$pcs_nickname>>," she says with a smile. "Are you here to study? Or have you turned the library into your hunting ground?" Katja giggles at her own joke.'
-			elseif npc_rel['A14'] <= 20:
-				'"Why are you disturbing me?" she scowls. "This is a place to study, so if you''re here to slut it up, then don''t."'
-			else
-				'"What are you doing here <<$pcs_nickname>>?" she says. "This is a place for studying, not hitting on boys."' 
-			end
+		cla & *clr
+		menu_off = 1
+		minut += 2
+		gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'library'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_alone.jpg"></center>'
+		'You approach Katja, who is clearly studying. She doesn''t notice you until you''re right next to her.'
+		if npc_sex['A14'] >= 1 and katjaQW['sex_clossedness'] < 2:
+			'"Hi <<$pcs_nickname>>," she says with a big smile. She gets up to give you a quick kiss.'
+			'"What''s up?" you say.'
+			'"Just studying for my classes," she says. "I dont''t want to fall behind."'
+		elseif katjaQW['QWstage'] > 0:
+			'"Hi <<$pcs_nickname>>," she says with a big smile and gets up to give you a quick hug before she sits down again.'
+			'"What''s up?" you say.'
+			'"Just studying for my classes," she says. "I dont''t want to fall behind."'
 		else
-			if npc_rel['A14'] >= 50:
-				'"Hi <<$pcs_nickname>>," she says with a smile. "Are you also here to study?"'
-			elseif npc_rel['A14'] <= 20:
-				'"Why are you disturbing me?" she scowls. "Leave me alone. Some of us actually take our studies seriously."'
+			if fame['city_slut'] > 200:
+				if npc_rel['A14'] >= 50:
+					'"Hi <<$pcs_nickname>>," she says with a smile. "Are you here to study? Or have you turned the library into your hunting ground?" Katja giggles at her own joke.'
+				elseif npc_rel['A14'] <= 20:
+					'"Why are you disturbing me?" she scowls. "This is a place to study, so if you''re here to slut it up, then don''t."'
+				else
+					'"What are you doing here <<$pcs_nickname>>?" she says. "This is a place for studying, not hitting on boys."' 
+				end
 			else
-				'"What are you doing here <<$pcs_nickname>>?" she says. "I''m trying to study, so I would like some peace and quiet!" she says, waiting to see your reaction.' 
-			end
-		end
-	end
-	act 'Apologise and leave': gt 'uni_library', 'start'
-	if $university['enrolled_in'] = 'teaching_studies':	
-		if university['semester_week'] > 0:
-			i = 0
-			:study_loop
-			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
-				if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
-					dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> class together'': gt ''katja_uni'', ''studying_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
+				if npc_rel['A14'] >= 50:
+					'"Hi <<$pcs_nickname>>," she says with a smile. "Are you also here to study?"'
+				elseif npc_rel['A14'] <= 20:
+					'"Why are you disturbing me?" she scowls. "Leave me alone. Some of us actually take our studies seriously."'
 				else
-					*nl
-					'You don''t need to study any more this week for your <<$class_list_name[i]>> class.'
+					'"What are you doing here <<$pcs_nickname>>?" she says. "I''m trying to study, so I would like some peace and quiet!" she says, waiting to see your reaction.' 
 				end
 			end
+		end
+		act 'Apologize and leave': gt 'uni_library', 'start'
+		if $university['enrolled_in'] = 'teaching_studies':	
+			if university['semester_week'] > 0:
+				i = 0
+				:study_loop
+				if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
+					if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
+						dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> class together'': gt ''katja_uni'', ''studying_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
+					else
+						*nl
+						'You don''t need to study any more this week for your <<$class_list_name[i]>> class.'
+					end
+				end
 		
-			i += 1
-			if ARRSIZE('class_list_institution') >= i: jump 'study_loop'
-			killvar 'i'
-		elseif university['exam_week'] > 0:
-			i = 0
-			:exam_loop
-			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
-				dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> exam together'': gt ''katja_uni'', ''studying_exam_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
-			end
+				i += 1
+				if ARRSIZE('class_list_institution') >= i: jump 'study_loop'
+				killvar 'i'
+			elseif university['exam_week'] > 0:
+				i = 0
+				:exam_loop
+				if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
+					dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> exam together'': gt ''katja_uni'', ''studying_exam_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
+				end
 		
-			i += 1
-			if ARRSIZE('class_list_institution') >= i: jump 'exam_loop'
-			killvar 'i'
-		end			
-	elseif npc_rel['A14'] >= 50:
-		act 'Watch her studying': gt 'katja_uni', 'study_watch'
+				i += 1
+				if ARRSIZE('class_list_institution') >= i: jump 'exam_loop'
+				killvar 'i'
+			end			
+		elseif npc_rel['A14'] >= 50:
+			act 'Watch her studying': gt 'katja_uni', 'study_watch'
+		end
 	end
 end
 
@@ -1064,6 +1075,7 @@ if $ARGS[0] = 'studying_exam':
 			'"Well, it looks like the library is closing up," Katja says, reaching to pack up her stuff. "But it was nice studying together. We should do it again sometime!"'
 			'You leave together, parting ways at the entrance with a wave and a smile.'
 		else
+			katjaQW['sent_home_from_library_day'] = daystart
 			'You say goodbye to Katja and leave the library'
 		end
 		act 'Leave':

+ 1 - 1
locations/pav_complex.qsrc

@@ -299,7 +299,7 @@ if $ARGS[0] = 'garages':
 									gs 'stat'
 									act 'Suck his dick':
 										cla & *clr
-										gs 'boyStat', 'A154'
+										gs 'boyStat', 'A158'
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/val/val3.jpg"></center>'
 										'You pull his pants down and lean forward. Opening your mouth, you take his <<dick>>cm <<$dick_girth>> dick into your mouth and lock your lips around his shaft. Your tongue presses hard against the shaft of his cock as you start bobbing your head up and down, sucking his dick. Before long, he starts moaning and places a hand on top of your head, forcing you to take his dick deeper into your mouth.'

+ 1 - 1
locations/pav_park.qsrc

@@ -368,7 +368,7 @@ end
 if $ARGS[0] = 'run':
 	*clr & cla
 	menu_off = 1
-	gs 'exercise', 'tier1', 60, 'run_exp'
+	gs 'exercise', 'tier1', 60, 'run'
 	fat -= rand(0,4)
 	gs 'sweat', 'add', 5
 	daybegskver = daystart

+ 1 - 1
locations/stat_display.qsrc

@@ -434,7 +434,7 @@ else
 end
 
 if nerd_game['game_day'] = daystart and hour < 20:
-    $stat_game_night_msg = 'Game night starts tonight at 20:00 at the Community Center'
+    $stat_game_night_msg = 'Game night starts tonight at '+iif(yearstart > 1, '18:00 at the Coffee Hole', '20:00 at the Community Center')
 	$stat_game_night_tooltip = 'Nerd Game Night'
 else
     $stat_game_night_msg = ''

+ 1 - 1
locations/uni_cafe.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'sitting_choice':
 		uni_lunch_bought = 0
 		'<center><b><font color="maroon">University Cafe</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_cafe.jpg"></center>'
-		'You sit down and eat your lunch alone and <<$mtxt>>'
+		'You sit down and eat your lunch alone and<<$mtxt>>'
 		gs 'stat'
 		
 		act 'Leave': gt 'uni_grounds', 'main'

+ 3 - 3
locations/uni_programs.qsrc

@@ -496,7 +496,7 @@ if $ARGS[0] = 'uni_period_third':
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
 					gs 'stat'
-					gt 'uni_lessons_electives1', $university['elective_semester_2_1']
+					gt 'uni_lessons_electives2', $university['elective_semester_2_1']
 				end
 			elseif week = 2 and $university['elective_semester_2_2'] ! '':
 				*nl
@@ -506,7 +506,7 @@ if $ARGS[0] = 'uni_period_third':
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
 					gs 'stat'
-					gt 'uni_lessons_electives1', $university['elective_semester_2_2']
+					gt 'uni_lessons_electives2', $university['elective_semester_2_2']
 				end
 			elseif week = 3:
 				*nl
@@ -526,7 +526,7 @@ if $ARGS[0] = 'uni_period_third':
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
 					gs 'stat'
-					gt 'uni_lessons_electives1', $university['elective_semester_2_3']
+					gt 'uni_lessons_electives2', $university['elective_semester_2_3']
 				end
 			end
 		elseif university['enrolled_in_semester'] = 3: